Merge master and multifarious hackery.

[dcpomatic.git] / src / wx / film_editor.h

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 3f72642964415324093f8770f1ccfb1b97bbf774..89065c97d9cc5b4401d48c2393fef1b4a098fe2d 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -105,13 +105,13 @@ private:
        void setup_main_notebook_size ();
        void setup_content ();
        void setup_container ();
-       void setup_content_button_sensitivity ();
+       void setup_content_sensitivity ();
        void setup_loop_sensitivity ();
-       void setup_content_properties ();
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();
        boost::shared_ptr<VideoContent> selected_video_content ();
+       boost::shared_ptr<AudioContent> selected_audio_content ();
 
        wxNotebook* _main_notebook;
        wxNotebook* _content_notebook;