ardour/livetrax
13
0
Fork 0
Code

Move selection/punch clocks to editor Sidebar

Browse Source
This commit is contained in:
Robin Gareus 2016-12-17 02:31:41 +01:00
parent 1a25b906b3
commit 85e4b1d98f
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View File

@ -254,8 +254,6 @@ public:
void focus_on_clock ();
AudioClock* big_clock;
TimeInfoBox* time_info_box;
VideoTimeLine *video_timeline;
void store_clock_modes ();

5
gtk2_ardour/ardour_ui2.cc
View File

@ -58,7 +58,6 @@
#include "global_port_matrix.h"
#include "location_ui.h"
#include "rc_option_editor.h"
#include "time_info_box.h"
#include "pbd/i18n.h"
@ -393,8 +392,6 @@ ARDOUR_UI::setup_transport ()
punch_button_size_group->add_widget (punch_in_button);
punch_button_size_group->add_widget (punch_out_button);
// external widgets
time_info_box = manage (new TimeInfoBox);
shuttle_box = manage (new ShuttleControl);
/* and now the layout... */
@ -489,8 +486,6 @@ ARDOUR_UI::setup_transport ()
transport_table.attach (editor_visibility_button, 14, 15, 0, 1 , FILL, SHRINK, 1, 0);
transport_table.attach (mixer_visibility_button, 14, 15, 1, 2 , FILL, SHRINK, 1, 0);
transport_table.attach (*time_info_box, 15, 16, 0, 2, SHRINK, EXPAND|FILL, 1, 0); // XXX
/* desensitize */
feedback_alert_button.set_sensitive (false);

2
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -67,7 +67,6 @@
#include "splash.h"
#include "sfdb_ui.h"
#include "theme_manager.h"
#include "time_info_box.h"
#include "timers.h"
#include "pbd/i18n.h"
@ -115,7 +114,6 @@ ARDOUR_UI::set_session (Session *s)
primary_clock->set_session (s);
secondary_clock->set_session (s);
big_clock->set_session (s);
time_info_box->set_session (s);
video_timeline->set_session (s);
/* sensitize menu bar options that are now valid */

2
gtk2_ardour/clearlooks.rc.in
View File

@ -272,7 +272,7 @@ style "inspector_processor_list" = "processor_list"
style "time_info_box"
{
bg[NORMAL] = { 0.05, 0.05, 0.05 }
bg[NORMAL] = { 0.00, 0.00, 0.00 }
}
style "status_bar_box"

12
gtk2_ardour/editor.cc
View File

@ -132,6 +132,7 @@
#include "sfdb_ui.h"
#include "tempo_lines.h"
#include "time_axis_view.h"
#include "time_info_box.h"
#include "timers.h"
#include "tooltips.h"
#include "ui_config.h"
@ -242,6 +243,7 @@ Editor::Editor ()
, editor_mixer_strip_width (Wide)
, constructed (false)
, _playlist_selector (0)
, _time_info_box (0)
, no_save_visual (false)
, leftmost_frame (0)
, samples_per_pixel (2048)
@ -643,6 +645,7 @@ Editor::Editor ()
_regions = new EditorRegions (this);
_snapshots = new EditorSnapshots (this);
_locations = new EditorLocations (this);
_time_info_box = new TimeInfoBox ();
/* these are static location signals */
@ -722,11 +725,14 @@ Editor::Editor ()
edit_pane.set_check_divider_position (true);
edit_pane.add (editor_summary_pane);
if (!ARDOUR::Profile->get_trx()) {
edit_pane.add (_the_notebook);
VBox* editor_list_vbox = manage (new VBox);
editor_list_vbox->pack_start (*_time_info_box, false, false, 0);
editor_list_vbox->pack_start (_the_notebook);
edit_pane.add (*editor_list_vbox);
edit_pane.set_child_minsize (*editor_list_vbox, 30); /* rough guess at width of notebook tabs */
}
edit_pane.set_drag_cursor (*_cursors->expand_left_right);
edit_pane.set_child_minsize (_the_notebook, 30); /* rough guess at width of notebook tabs */
editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
float fract;
@ -875,6 +881,7 @@ Editor::~Editor()
delete _snapshots;
delete _locations;
delete _playlist_selector;
delete _time_info_box;
for (list<XMLNode *>::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) {
delete *i;
@ -1312,6 +1319,7 @@ Editor::set_session (Session *t)
_snapshots->set_session (_session);
_routes->set_session (_session);
_locations->set_session (_session);
_time_info_box->set_session (_session);
if (rhythm_ferret) {
rhythm_ferret->set_session (_session);

3
gtk2_ardour/editor.h
View File

@ -134,6 +134,7 @@ class SoundFileOmega;
class StreamView;
class TempoLines;
class TimeAxisView;
class TimeInfoBox;
class TimeFXDialog;
class TimeSelection;
class RegionLayeringOrderEditor;
@ -571,6 +572,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
PlaylistSelector* _playlist_selector;
TimeInfoBox* _time_info_box;
typedef std::pair<TimeAxisView*,XMLNode*> TAVState;
struct VisualState {