smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

fix compiler complaints about RCU code; fix a couple of compiler warnings

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1511 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-02-26 17:44:09 +00:00
parent 54f18f26d4
commit c20e55d07a
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ardour_ui_options.cc
View file

@ -77,7 +77,7 @@ ARDOUR_UI::toggle_send_midi_feedback ()
void void
ARDOUR_UI::set_native_file_header_format (HeaderFormat hf) ARDOUR_UI::set_native_file_header_format (HeaderFormat hf)
{ {
const char *action; const char *action = 0;
switch (hf) { switch (hf) {
case BWF: case BWF:
@ -119,7 +119,7 @@ ARDOUR_UI::set_native_file_header_format (HeaderFormat hf)
void void
ARDOUR_UI::set_native_file_data_format (SampleFormat sf) ARDOUR_UI::set_native_file_data_format (SampleFormat sf)
{ {
const char* action; const char* action = 0;
switch (sf) { switch (sf) {
case FormatFloat: case FormatFloat:

2
libs/fst/vstwin.c
View file

@ -514,7 +514,7 @@ fst_load (const char *path)
return NULL; return NULL;
} }
if ((fhandle->main_entry = GetProcAddress (fhandle->dll, "main")) == NULL) { if ((fhandle->main_entry = ((AEffect*)()(audioMasterCallback)) GetProcAddress (fhandle->dll, "main")) == NULL) {
fst_unload (fhandle); fst_unload (fhandle);
return NULL; return NULL;
} }

19
libs/pbd/pbd/rcu.h
View file

@ -12,22 +12,21 @@ class RCUManager
public: public:
RCUManager (T* new_rcu_value) { RCUManager (T* new_rcu_value) {
m_rcu_value = new boost::shared_ptr<T> (new_rcu_value); x.m_rcu_value = new boost::shared_ptr<T> (new_rcu_value);
} }
virtual ~RCUManager() { delete m_rcu_value; } virtual ~RCUManager() { delete x.m_rcu_value; }
boost::shared_ptr<T> reader () const { return *((boost::shared_ptr<T> *) g_atomic_pointer_get (the_pointer())); } boost::shared_ptr<T> reader () const { return *((boost::shared_ptr<T> *) g_atomic_pointer_get (&x.gptr)); }
virtual boost::shared_ptr<T> write_copy () = 0; virtual boost::shared_ptr<T> write_copy () = 0;
virtual bool update (boost::shared_ptr<T> new_value) = 0; virtual bool update (boost::shared_ptr<T> new_value) = 0;
protected: protected:
boost::shared_ptr<T>* m_rcu_value; union {
boost::shared_ptr<T>* m_rcu_value;
// this monstrosity is needed because of some wierd behavior by g++ volatile gpointer gptr;
} x;
gpointer * the_pointer() const { return (gpointer *) &m_rcu_value; }
}; };
@ -60,7 +59,7 @@ public:
// store the current // store the current
current_write_old = RCUManager<T>::m_rcu_value; current_write_old = RCUManager<T>::x.m_rcu_value;
boost::shared_ptr<T> new_copy (new T(**current_write_old)); boost::shared_ptr<T> new_copy (new T(**current_write_old));
@ -76,7 +75,7 @@ public:
// update, checking that nobody beat us to it // update, checking that nobody beat us to it
bool ret = g_atomic_pointer_compare_and_exchange (RCUManager<T>::the_pointer(), bool ret = g_atomic_pointer_compare_and_exchange (&RCUManager<T>::x.gptr,
(gpointer) current_write_old, (gpointer) current_write_old,
(gpointer) new_spp); (gpointer) new_spp);

2
vst/ardevst
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
export ARDOUR_PATH=../gtk2_ardour/icons:../gtk2_ardour/pixmaps:../gtk2_ardour export ARDOUR_PATH=../gtk2_ardour/icons:../gtk2_ardour/pixmaps:../gtk2_ardour
export LD_LIBRARY_PATH=../gtk2_ardour:../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libsndfile:../libs/appleutility:$$LD_LIBRARY_PATH export LD_LIBRARY_PATH=../gtk2_ardour:../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libsndfile:../libs/appleutility:$LD_LIBRARY_PATH
export GTK_PATH=$PWD/../libs/clearlooks:~/.ardour2 export GTK_PATH=$PWD/../libs/clearlooks:~/.ardour2
exec wine ./ardour_vst.exe.so "$@" exec wine ./ardour_vst.exe.so "$@"