Add session preferences dialog.

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 81e0e0da5cccf1a8547f3c9d4a95155260c7217e..a1a36f3d99d602f6a8078e14273f77b0cd9d948c 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -60,7 +60,6 @@
 #include <gtkmm2ext/bindable_button.h>
 #include "ardour/ardour.h"
 #include "ardour/session.h"
-#include "ardour/configuration.h"
 #include "ardour/types.h"
 
 #include "audio_clock.h"
@@ -71,7 +70,8 @@
 class AudioClock;
 class PublicEditor;
 class Keyboard;
-class OptionEditor;
+class RCOptionEditor;
+class SessionOptionEditor;
 class KeyEditor;
 class Mixer_UI;
 class ConnectionEditor;
@@ -257,7 +257,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void toggle_session_auto_loop ();
 
-       void toggle_options_window ();
+       void toggle_rc_options_window ();
+       void toggle_session_options_window ();
 
   private:
        ArdourStartup*      _startup;
@@ -597,9 +598,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        KeyEditor *key_editor;
 
-       /* Options window */
+       /* RC Options window */
 
-       OptionEditor *option_editor;
+       RCOptionEditor *rc_option_editor;
+
+       SessionOptionEditor *session_option_editor;
 
        /* route dialog */
 
@@ -727,7 +730,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void map_input_auto_connect ();
        void map_output_auto_connect ();
        void map_only_copy_imported_files ();
-       void parameter_changed (const char*);
+       void parameter_changed (std::string);
 
        void set_meter_hold (ARDOUR::MeterHold);
        void set_meter_falloff (ARDOUR::MeterFalloff);