Trigger Cues: add to trigger page
This commit is contained in:
parent
0e26bd19c4
commit
d20298549e
|
@ -35,6 +35,8 @@
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
#include "trigger_page.h"
|
#include "trigger_page.h"
|
||||||
#include "trigger_strip.h"
|
#include "trigger_strip.h"
|
||||||
|
#include "cuebox_ui.h"
|
||||||
|
#include "trigger_stopper.h"
|
||||||
#include "ui_config.h"
|
#include "ui_config.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
|
@ -49,12 +51,20 @@ using namespace std;
|
||||||
|
|
||||||
TriggerPage::TriggerPage ()
|
TriggerPage::TriggerPage ()
|
||||||
: Tabbable (_content, _("Trigger Drom"), X_("trigger"))
|
: Tabbable (_content, _("Trigger Drom"), X_("trigger"))
|
||||||
|
, _stopper_widget(32, 16.)
|
||||||
{
|
{
|
||||||
load_bindings ();
|
load_bindings ();
|
||||||
register_actions ();
|
register_actions ();
|
||||||
|
|
||||||
|
CueBoxWidget *cue_box = new CueBoxWidget(32, 8*16.);
|
||||||
|
cue_box->show();
|
||||||
|
_slot_area_box.pack_start (*cue_box, Gtk::PACK_SHRINK);
|
||||||
|
|
||||||
|
_stopper = new CueStopper(_stopper_widget.root());
|
||||||
|
_stopper->show();
|
||||||
|
_slot_area_box.pack_start (_stopper_widget, Gtk::PACK_SHRINK);
|
||||||
|
|
||||||
#if 1 /* Placeholders */
|
#if 1 /* Placeholders */
|
||||||
_slot_area_box.pack_start (*Gtk::manage (new Gtk::Label ("Fixed\nWidth\nSlot\nArea")));
|
|
||||||
_browser_box.pack_start (*Gtk::manage (new Gtk::Label ("File Browser")));
|
_browser_box.pack_start (*Gtk::manage (new Gtk::Label ("File Browser")));
|
||||||
_parameter_box.pack_start (*Gtk::manage (new Gtk::Label ("Parameter HBox")));
|
_parameter_box.pack_start (*Gtk::manage (new Gtk::Label ("Parameter HBox")));
|
||||||
_slot_area_box.show_all ();
|
_slot_area_box.show_all ();
|
||||||
|
|
|
@ -29,7 +29,10 @@
|
||||||
#include "widgets/pane.h"
|
#include "widgets/pane.h"
|
||||||
#include "widgets/tabbable.h"
|
#include "widgets/tabbable.h"
|
||||||
|
|
||||||
|
#include "fitted_canvas_widget.h"
|
||||||
|
|
||||||
class TriggerStrip;
|
class TriggerStrip;
|
||||||
|
class CueStopper;
|
||||||
|
|
||||||
class TriggerPage : public ArdourWidgets::Tabbable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
|
class TriggerPage : public ArdourWidgets::Tabbable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
|
||||||
{
|
{
|
||||||
|
@ -76,6 +79,9 @@ private:
|
||||||
Gtk::VBox _browser_box;
|
Gtk::VBox _browser_box;
|
||||||
Gtk::HBox _parameter_box;
|
Gtk::HBox _parameter_box;
|
||||||
|
|
||||||
|
FittedCanvasWidget _stopper_widget;
|
||||||
|
CueStopper *_stopper;
|
||||||
|
|
||||||
std::list<TriggerStrip*> _strips;
|
std::list<TriggerStrip*> _strips;
|
||||||
sigc::connection _fast_screen_update_connection;
|
sigc::connection _fast_screen_update_connection;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user