From 95b86fdf56fcc846f52f965e2fb2f8d91065568b Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 17 Nov 2014 15:41:57 +0200 Subject: [PATCH] [Summary] Added mtc indicator [Reviewed] GZharun --- gtk2_ardour/ardour_ui.h | 5 +++++ gtk2_ardour/ardour_ui_ed.cc | 18 +++++++++++++++++- gtk2_ardour/icons/mtc_idle.png | Bin 0 -> 4267 bytes gtk2_ardour/icons/mtc_sync.png | Bin 0 -> 4627 bytes gtk2_ardour/ui/editor_window.xml | 17 +++++++++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gtk2_ardour/icons/mtc_idle.png create mode 100644 gtk2_ardour/icons/mtc_sync.png diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e987cfbe4e..1b646099d7 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -253,6 +253,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void on_timecode_source_dropdown_item_clicked (WavesDropdown*, int); void populate_timecode_source_dropdown (); void update_timecode_source_dropdown_items (); + void set_mtc_indicator_active (bool set_active); + void hide_mtc_indicator (); void update_bit_depth_button (); void update_sample_rate_dropdown (); @@ -786,6 +788,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::Label* _dsp_load_label; Gtk::Label* _hd_load_label; Gtk::Label* _hd_remained_time_label; + + Gtk::Image* _mtc_idle_icon; + Gtk::Image* _mtc_sync_icon; /** A ProcessThread so that we have some thread-local buffers for use by * PluginEqGui::impulse_analysis (). diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 88030dfd72..5406189db1 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -92,7 +92,9 @@ ARDOUR_UI::create_editor () _sample_rate_dropdown = &editor->get_waves_dropdown("sample_rate_dropdown"); _display_format_dropdown = &editor->get_waves_dropdown("display_format_dropdown"); _timecode_source_dropdown = &editor->get_waves_dropdown("timecode_selector_dropdown"); - + _mtc_idle_icon = &editor->get_image("mtc_idle_icon"); + _mtc_sync_icon = &editor->get_image("mtc_sync_icon"); + _tracks_button = &editor->get_waves_button("tracks_button"); } @@ -204,6 +206,20 @@ ARDOUR_UI::update_timecode_source_dropdown_items() } } +void +ARDOUR_UI::set_mtc_indicator_active (bool set_active) +{ + _mtc_sync_icon->set_visible (set_active); + _mtc_idle_icon->set_visible (!set_active); +} + +void +ARDOUR_UI::hide_mtc_indicator () +{ + _mtc_sync_icon->set_visible (false); + _mtc_idle_icon->set_visible (false); +} + void ARDOUR_UI::on_display_format_dropdown_item_clicked (WavesDropdown* dropdown, int el_number) { diff --git a/gtk2_ardour/icons/mtc_idle.png b/gtk2_ardour/icons/mtc_idle.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc246c03ee35091bc9e89356d5c75200622284c GIT binary patch literal 4267 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 AnE(I) literal 0 HcmV?d00001 diff --git a/gtk2_ardour/icons/mtc_sync.png b/gtk2_ardour/icons/mtc_sync.png new file mode 100644 index 0000000000000000000000000000000000000000..ff1a3f166f0afc6d66e60b322e0c0d3fd9bff4f5 GIT binary patch literal 4627 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 literal 0 HcmV?d00001 diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml index bde6fdc6b0..fc62b2eac3 100644 --- a/gtk2_ardour/ui/editor_window.xml +++ b/gtk2_ardour/ui/editor_window.xml @@ -140,6 +140,23 @@ box.expand="true"> + + + + +