the basics of tabbed

1 files changed, 18 insertions, 0 deletions

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index a909228b06..8e4eab1979 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -42,10 +42,13 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_manager.h"
 
+<<<<<<< HEAD
 #include "gtkmm2ext/visibility_tracker.h"
 #include "gtkmm2ext/dndtreeview.h"
 #include "gtkmm2ext/treeutils.h"
 
+=======
+>>>>>>> the basics of tabbed
 #include "enums.h"
 #include "mixer_actor.h"
 
@@ -59,6 +62,7 @@ class PluginSelector;
 class MixerGroupTabs;
 class MonitorSection;
 
+<<<<<<< HEAD
 class PluginTreeStore : public Gtk::TreeStore
 {
 public:
@@ -73,11 +77,19 @@ protected:
 };
 
 class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor, public Gtkmm2ext::VisibilityTracker
+=======
+class Mixer_UI : public Gtk::VBox, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor
+>>>>>>> the basics of tabbed
 {
   public:
 	static Mixer_UI* instance();
 	~Mixer_UI();
 
+	Gtk::Window* own_window() const { return _parent_window; }
+	Gtk::Notebook* use_own_window();
+
+	bool visible() const { return _visible; }
+	
 	void set_session (ARDOUR::Session *);
 	void track_editor_selection ();
 
@@ -119,6 +131,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	Mixer_UI ();
 	static Mixer_UI* _instance;
 
+	Gtk::Window*                            _parent_window;
 	bool					_visible;
 
 	Gtk::HBox				global_hpacker;
@@ -347,6 +360,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
 	void monitor_section_going_away ();
 
+<<<<<<< HEAD
 	void monitor_section_attached ();
 	void monitor_section_detached ();
 
@@ -357,6 +371,10 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&);
 	void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
 
+=======
+	void create_own_window ();
+	
+>>>>>>> the basics of tabbed
 	/// true if we are in fullscreen mode
 	bool _maximised;