Merged with trunk R874.

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 1f5277b5fee6633732661fa4082a7682c135ca40..d0e90c42bebc9ff75785df00e5c6d935aa51e0b1 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -530,7 +530,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        bool _will_create_new_session_automatically;
 
-       NewSessionDialog* m_new_session_dialog;
+       NewSessionDialog* new_session_dialog;
        
        void open_session ();
        void open_recent_session ();
@@ -645,7 +645,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        struct timeval last_peak_grab;
        struct timeval last_shuttle_request;
 
-       void delete_sources_in_the_right_thread (list<ARDOUR::Source*>*);
+       void delete_sources_in_the_right_thread (list<boost::shared_ptr<ARDOUR::Source> >*);
 
        void editor_display_control_changed (Editing::DisplayControl c);