projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
probably fix cleanup issues, but testing required
[ardour.git]
/
gtk2_ardour
/
mixer_ui.h
diff --git
a/gtk2_ardour/mixer_ui.h
b/gtk2_ardour/mixer_ui.h
index 864a110de7cc0568d5687dcb32e3f41c22d03dfd..bf9c9cbd18c6b63bedaa42776ea6d05ef4030503 100644
(file)
--- a/
gtk2_ardour/mixer_ui.h
+++ b/
gtk2_ardour/mixer_ui.h
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_mixer_ui_h__
*/
#ifndef __ardour_mixer_ui_h__
@@
-38,7
+37,6
@@
#include <ardour/ardour.h>
#include <ardour/io.h>
#include <ardour/ardour.h>
#include <ardour/io.h>
-#include "keyboard_target.h"
#include "route_redirect_selection.h"
#include "enums.h"
#include "route_redirect_selection.h"
#include "enums.h"
@@
-47,7
+45,6
@@
namespace ARDOUR {
class RouteGroup;
class Session;
class AudioDiskstream;
class RouteGroup;
class Session;
class AudioDiskstream;
- class AudioEngine;
};
class MixerStrip;
};
class MixerStrip;
@@
-56,7
+53,7
@@
class PluginSelector;
class Mixer_UI : public Gtk::Window
{
public:
class Mixer_UI : public Gtk::Window
{
public:
- Mixer_UI (
ARDOUR::AudioEngine&
);
+ Mixer_UI ();
~Mixer_UI();
void connect_to_session (ARDOUR::Session *);
~Mixer_UI();
void connect_to_session (ARDOUR::Session *);
@@
-73,6
+70,7
@@
class Mixer_UI : public Gtk::Window
int set_state (const XMLNode& );
void show_window ();
int set_state (const XMLNode& );
void show_window ();
+ bool hide_window (GdkEventAny *ev);
void show_strip (MixerStrip *);
void hide_strip (MixerStrip *);
void show_strip (MixerStrip *);
void hide_strip (MixerStrip *);
@@
-81,8
+79,9
@@
class Mixer_UI : public Gtk::Window
RouteRedirectSelection& selection() { return _selection; }
private:
RouteRedirectSelection& selection() { return _selection; }
private:
- ARDOUR::AudioEngine& engine;
ARDOUR::Session *session;
ARDOUR::Session *session;
+
+ bool _visible;
Gtk::HBox global_hpacker;
Gtk::VBox global_vpacker;
Gtk::HBox global_hpacker;
Gtk::VBox global_vpacker;
@@
-111,7
+110,7
@@
class Mixer_UI : public Gtk::Window
bool strip_scroller_button_release (GdkEventButton*);
bool strip_scroller_button_release (GdkEventButton*);
- void add_strip (ARDOUR::
Route*
);
+ void add_strip (ARDOUR::
Session::RouteList&
);
void remove_strip (MixerStrip *);
void hide_all_strips (bool with_select);
void remove_strip (MixerStrip *);
void hide_all_strips (bool with_select);
@@
-194,7
+193,7
@@
class Mixer_UI : public Gtk::Window
}
Gtk::TreeModelColumn<bool> visible;
Gtk::TreeModelColumn<Glib::ustring> text;
}
Gtk::TreeModelColumn<bool> visible;
Gtk::TreeModelColumn<Glib::ustring> text;
- Gtk::TreeModelColumn<
ARDOUR::Route*
> route;
+ Gtk::TreeModelColumn<
boost::shared_ptr<ARDOUR::Route>
> route;
Gtk::TreeModelColumn<MixerStrip*> strip;
};
Gtk::TreeModelColumn<MixerStrip*> strip;
};