ardour/livetrax
13
0
Fork 0
Code

Save/Restore TimeInfoBox clock modes

Browse Source 
The clocks are not transient, so ARDOUR_UI::store_clock_modes takes
care of saving the state and the clock restores itself.
This commit is contained in:
Robin Gareus 2017-03-10 20:39:46 +01:00
parent eac0a2b6ec
commit 2562a5ce3b
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -271,7 +271,7 @@ ARDOUR_UI::setup_windows ()
mixer->add_to_notebook (_tabs, _("Mixer")); mixer->add_to_notebook (_tabs, _("Mixer"));
editor->add_to_notebook (_tabs, _("Editor")); editor->add_to_notebook (_tabs, _("Editor"));
time_info_box = new TimeInfoBox (false); time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
/* all other dialogs are created conditionally */ /* all other dialogs are created conditionally */
we_have_dependents (); we_have_dependents ();

2
gtk2_ardour/editor.cc
View File

@ -643,7 +643,7 @@ Editor::Editor ()
_regions = new EditorRegions (this); _regions = new EditorRegions (this);
_snapshots = new EditorSnapshots (this); _snapshots = new EditorSnapshots (this);
_locations = new EditorLocations (this); _locations = new EditorLocations (this);
_time_info_box = new TimeInfoBox (true); _time_info_box = new TimeInfoBox ("EditorTimeInfo", true);
/* these are static location signals */ /* these are static location signals */

22
gtk2_ardour/time_info_box.cc
View File

@ -43,7 +43,7 @@ using namespace ARDOUR;
using std::min; using std::min;
using std::max; using std::max;
TimeInfoBox::TimeInfoBox (bool with_punch) TimeInfoBox::TimeInfoBox (std::string state_node_name, bool with_punch)
: table (3, 3) : table (3, 3)
, punch_start (0) , punch_start (0)
, punch_end (0) , punch_end (0)
@ -53,9 +53,15 @@ TimeInfoBox::TimeInfoBox (bool with_punch)
{ {
set_name (X_("TimeInfoBox")); set_name (X_("TimeInfoBox"));
selection_start = new AudioClock ("selection-start", false, "selection", false, false, false, false); selection_start = new AudioClock (
selection_end = new AudioClock ("selection-end", false, "selection", false, false, false, false); string_compose ("%1-selection-start", state_node_name),
selection_length = new AudioClock ("selection-length", false, "selection", false, false, true, false); false, "selection", false, false, false, false);
selection_end = new AudioClock (
string_compose ("%1-selection-end", state_node_name),
false, "selection", false, false, false, false);
selection_length = new AudioClock (
string_compose ("%1-selection-length", state_node_name),
false, "selection", false, false, true, false);
selection_title.set_text (_("Selection")); selection_title.set_text (_("Selection"));
@ -98,8 +104,12 @@ TimeInfoBox::TimeInfoBox (bool with_punch)
table.attach (*selection_length, 1, 2, 3, 4); table.attach (*selection_length, 1, 2, 3, 4);
if (with_punch_clock) { if (with_punch_clock) {
punch_start = new AudioClock ("punch-start", false, "punch", false, false, false, false); punch_start = new AudioClock (
punch_end = new AudioClock ("punch-end", false, "punch", false, false, false, false); string_compose ("%1-punch-start", state_node_name),
false, "punch", false, false, false, false);
punch_end = new AudioClock (
string_compose ("%1-punch-end", state_node_name),
false, "punch", false, false, false, false);
punch_title.set_text (_("Punch")); punch_title.set_text (_("Punch"));
punch_title.set_name ("TimeInfoSelectionTitle"); punch_title.set_name ("TimeInfoSelectionTitle");

2
gtk2_ardour/time_info_box.h
View File

@ -43,7 +43,7 @@ class AudioClock;
class TimeInfoBox : public CairoHPacker, public ARDOUR::SessionHandlePtr class TimeInfoBox : public CairoHPacker, public ARDOUR::SessionHandlePtr
{ {
public: public:
TimeInfoBox (bool with_punch); TimeInfoBox (std::string state_node_name, bool with_punch);
~TimeInfoBox (); ~TimeInfoBox ();
void set_session (ARDOUR::Session*); void set_session (ARDOUR::Session*);