#include <iostream>
#include <cmath>
-#include <gtkmm.h>
+#include <sigc++/bind.h>
#include <pbd/error.h>
#include <pbd/basename.h>
#include <pbd/fastlog.h>
#include "ardour_ui.h"
#include "public_editor.h"
#include "audio_clock.h"
-#include "extra_bind.h"
+#include "actions.h"
+#include "utils.h"
#include "i18n.h"
using namespace ARDOUR;
using namespace Gtkmm2ext;
using namespace Gtk;
+using namespace Glib;
using namespace sigc;
+
+static const gchar *psync_strings[] = {
+ N_("Internal"),
+ N_("Slave to MTC"),
+ N_("Sync with JACK"),
+ 0
+};
+
+static vector<string> positional_sync_strings;
+
int
ARDOUR_UI::setup_windows ()
{
return -1;
}
- if (create_meter_bridge ()) {
- error << _("UI: cannot setup meter_bridge") << endmsg;
- return -1;
- }
-
/* all other dialogs are created conditionally */
we_have_dependents ();
return 0;
}
-
void
ARDOUR_UI::setup_adjustables ()
-
{
adjuster_table.set_homogeneous (true);
online_control_button = new GlobalClickBox ("CONTROL",
online_control_strings);
- online_control_button->adjustment.value_changed.connect(mem_fun(*this,&ARDOUR_UI::control_methods_adjusted));
+ online_control_button->adjustment.signal_value_changed().connect(mem_fun(*this,&ARDOUR_UI::control_methods_adjusted));
mmc_id_strings.push_back ("1");
mmc_id_strings.push_back ("2");
mmc_id_button = new GlobalClickBox (_("MMC ID"), mmc_id_strings);
- mmc_id_button->adjustment.value_changed.connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted));
+ mmc_id_button->adjustment.signal_value_changed().connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted));
- adjuster_table.attach (*online_control_button, 0, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, 0, 5, 5);
- adjuster_table.attach (*mmc_id_button, 2, 3, 1, 2, 0, 0, 5, 5);
+ adjuster_table.attach (*online_control_button, 0, 2, 1, 2, FILL|EXPAND, FILL, 5, 5);
+ adjuster_table.attach (*mmc_id_button, 2, 3, 1, 2, FILL, FILL, 5, 5);
}
-#include "transport_xpms"
+static const gchar * loop_xpm[] = {
+"19 19 3 1",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+" ... ",
+" .+.. ",
+" .++.. ",
+" ...+++.... ",
+" ...++++++++... ",
+" ..+++.+++..+++.. ",
+" ..++...++.....++..",
+" .++.. .+.. ..++.",
+" .+.. ... ..+.",
+" .+. .+.",
+" .+.. ... ..+.",
+" .++.. ..+. ..++.",
+" ..++.....++...++..",
+" ..+++..+++.+++.. ",
+" ...++++++++... ",
+" ....+++... ",
+" ..++. ",
+" ..+. ",
+" ... "};
void
ARDOUR_UI::transport_stopped ()
{
+ stop_button.set_active (true);
roll_button.set_active (false);
play_selection_button.set_active (false);
auto_loop_button.set_active (false);
void
ARDOUR_UI::transport_rolling ()
{
+ stop_button.set_active (false);
+
if (session->get_play_range()) {
play_selection_button.set_active (true);
void
ARDOUR_UI::transport_rewinding ()
{
+ stop_button.set_active (false);
roll_button.set_active (true);
play_selection_button.set_active (false);
auto_loop_button.set_active (false);
void
ARDOUR_UI::transport_forwarding ()
{
+ stop_button.set_active (false);
roll_button.set_active (true);
play_selection_button.set_active (false);
auto_loop_button.set_active (false);
transport_base.set_name ("TransportBase");
transport_base.add (transport_hbox);
- transport_frame.set_shadow_type (Gtk::SHADOW_OUT);
+ transport_frame.set_shadow_type (SHADOW_OUT);
transport_frame.set_name ("BaseFrame");
transport_frame.add (transport_base);
- transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Gtk::Box*>(&top_packer),
- static_cast<Gtk::Widget*>(&transport_frame)));
- transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Gtk::Box*> (&top_packer),
- static_cast<Gtk::Widget*> (&transport_frame), 1));
+ transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
+ static_cast<Widget*>(&transport_frame)));
+ transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
+ static_cast<Widget*> (&transport_frame), 1));
+ vector<Gdk::Color> colors;
+ Gdk::Color c;
- goto_start_button.add (*(manage (new Gtk::Image (start_xpm))));
- goto_end_button.add (*(manage (new Gtk::Image (end_xpm))));
- roll_button.add (*(manage (new Gtk::Image (arrow_xpm))));
- stop_button.add (*(manage (new Gtk::Image (stop_xpm))));
- play_selection_button.add (*(manage (new Gtk::Image (play_selection_xpm))));
- rec_button.add (*(manage (new Gtk::Image (rec_xpm))));
- auto_loop_button.add (*(manage (new Gtk::Image (loop_xpm))));
+ /* record button has 3 color states, so we set 2 extra here */
+
+ c.set_rgb_p (0.91, 0.68, 0.68);
+ colors.push_back (c);
+ c.set_rgb_p (1, 0, 0);
+ colors.push_back (c);
+ rec_button.set_colors (colors);
+
+ colors.clear ();
+
+ /* other buttons get 2 color states, so add one here */
+
+ c.set_rgb_p (0.66, 0.97, 0.18);
+ colors.push_back (c);
+
+ stop_button.set_colors (colors);
+ roll_button.set_colors (colors);
+ auto_loop_button.set_colors (colors);
+ play_selection_button.set_colors (colors);
+ goto_start_button.set_colors (colors);
+ goto_end_button.set_colors (colors);
+
+ Widget* w;
+
+ stop_button.set_active (true);
+
+ w = manage (new Image (Stock::MEDIA_PREVIOUS, ICON_SIZE_BUTTON));
+ w->show();
+ goto_start_button.add (*w);
+ w = manage (new Image (Stock::MEDIA_NEXT, ICON_SIZE_BUTTON));
+ w->show();
+ goto_end_button.add (*w);
+ w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+ w->show();
+ roll_button.add (*w);
+ w = manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON));
+ w->show();
+ stop_button.add (*w);
+ w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+ w->show();
+ play_selection_button.add (*w);
+ w = manage (new Image (Stock::MEDIA_RECORD, ICON_SIZE_BUTTON));
+ w->show();
+ rec_button.add (*w);
+ w = manage (new Image (Gdk::Pixbuf::create_from_xpm_data(loop_xpm)));
+ w->show();
+ auto_loop_button.add (*w);
+
+ RefPtr<Action> act;
+
+ act = ActionManager::get_action (X_("Transport"), X_("Stop"));
+ act->connect_proxy (stop_button);
+ act = ActionManager::get_action (X_("Transport"), X_("Roll"));
+ act->connect_proxy (roll_button);
+ act = ActionManager::get_action (X_("Transport"), X_("Record"));
+ act->connect_proxy (rec_button);
+ act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
+ act->connect_proxy (goto_start_button);
+ act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
+ act->connect_proxy (goto_end_button);
+ act = ActionManager::get_action (X_("Transport"), X_("Loop"));
+ act->connect_proxy (auto_loop_button);
+ act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
+ act->connect_proxy (play_selection_button);
+ act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster"));
+ act->connect_proxy (time_master_button);
ARDOUR_UI::instance()->tooltips().set_tip (roll_button, _("Play from playhead"));
ARDOUR_UI::instance()->tooltips().set_tip (stop_button, _("Stop playback"));
ARDOUR_UI::instance()->tooltips().set_tip (punch_in_button, _("Start recording at auto-punch start"));
ARDOUR_UI::instance()->tooltips().set_tip (punch_out_button, _("Stop recording at auto-punch end"));
ARDOUR_UI::instance()->tooltips().set_tip (click_button, _("Enable/Disable audio click"));
- ARDOUR_UI::instance()->tooltips().set_tip (follow_button, _("Enable/Disable follow playhead"));
+ ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?"));
ARDOUR_UI::instance()->tooltips().set_tip (shuttle_box, _("Shuttle speed control"));
ARDOUR_UI::instance()->tooltips().set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
- ARDOUR_UI::instance()->tooltips().set_tip (shuttle_style_button, _("Select sprung or wheel behaviour"));
ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed"));
- shuttle_box.set_flags (Gtk::CAN_FOCUS);
- shuttle_box.set_events (shuttle_box.get_events() | GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK);
+ shuttle_box.set_flags (CAN_FOCUS);
+ shuttle_box.set_events (shuttle_box.get_events() | Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK);
shuttle_box.set_size_request (100, 15);
shuttle_box.set_name ("TransportButton");
punch_in_button.set_name ("TransportButton");
punch_out_button.set_name ("TransportButton");
click_button.set_name ("TransportButton");
- follow_button.set_name ("TransportButton");
+ time_master_button.set_name ("TransportButton");
+
+ goto_start_button.unset_flags (CAN_FOCUS);
+ goto_end_button.unset_flags (CAN_FOCUS);
+ roll_button.unset_flags (CAN_FOCUS);
+ stop_button.unset_flags (CAN_FOCUS);
+ play_selection_button.unset_flags (CAN_FOCUS);
+ rec_button.unset_flags (CAN_FOCUS);
+ auto_loop_button.unset_flags (CAN_FOCUS);
+ auto_return_button.unset_flags (CAN_FOCUS);
+ auto_play_button.unset_flags (CAN_FOCUS);
+ auto_input_button.unset_flags (CAN_FOCUS);
+ punch_out_button.unset_flags (CAN_FOCUS);
+ punch_in_button.unset_flags (CAN_FOCUS);
+ click_button.unset_flags (CAN_FOCUS);
+ time_master_button.unset_flags (CAN_FOCUS);
- goto_start_button.unset_flags (Gtk::CAN_FOCUS);
- goto_end_button.unset_flags (Gtk::CAN_FOCUS);
- roll_button.unset_flags (Gtk::CAN_FOCUS);
- stop_button.unset_flags (Gtk::CAN_FOCUS);
- play_selection_button.unset_flags (Gtk::CAN_FOCUS);
- rec_button.unset_flags (Gtk::CAN_FOCUS);
- auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
- auto_return_button.unset_flags (Gtk::CAN_FOCUS);
- auto_play_button.unset_flags (Gtk::CAN_FOCUS);
- auto_input_button.unset_flags (Gtk::CAN_FOCUS);
- punch_out_button.unset_flags (Gtk::CAN_FOCUS);
- punch_in_button.unset_flags (Gtk::CAN_FOCUS);
- click_button.unset_flags (Gtk::CAN_FOCUS);
- follow_button.unset_flags (Gtk::CAN_FOCUS);
-
- goto_start_button.set_events (goto_start_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- goto_end_button.set_events (goto_end_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- roll_button.set_events (roll_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- stop_button.set_events (stop_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- play_selection_button.set_events (play_selection_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- rec_button.set_events (rec_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- auto_loop_button.set_events (auto_loop_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- auto_return_button.set_events (auto_return_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- auto_play_button.set_events (auto_play_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- auto_input_button.set_events (auto_input_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- click_button.set_events (click_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- follow_button.set_events (click_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- punch_in_button.set_events (punch_in_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- punch_out_button.set_events (punch_out_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
-
- goto_start_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_start));
- goto_end_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_end));
-
- roll_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_roll));
- play_selection_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_play_selection));
- auto_loop_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_loop));
-
- stop_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_stop));
- rec_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_record));
-
- shuttle_box.button_press_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
- shuttle_box.button_release_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
- shuttle_box.motion_notify_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
- shuttle_box.expose_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
+ goto_start_button.set_events (goto_start_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ goto_end_button.set_events (goto_end_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ roll_button.set_events (roll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ stop_button.set_events (stop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ play_selection_button.set_events (play_selection_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ rec_button.set_events (rec_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ auto_loop_button.set_events (auto_loop_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ auto_return_button.set_events (auto_return_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ auto_play_button.set_events (auto_play_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ auto_input_button.set_events (auto_input_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ click_button.set_events (click_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ punch_in_button.set_events (punch_in_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ punch_out_button.set_events (punch_out_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ time_master_button.set_events (punch_out_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+
+ shuttle_box.signal_button_press_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
+ shuttle_box.signal_button_release_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
+ shuttle_box.signal_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
+ shuttle_box.signal_expose_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
/* clocks, etc. */
ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), false));
primary_clock.set_mode (AudioClock::SMPTE);
- primary_clock.set_name ("TransportClockDisplay");
secondary_clock.set_mode (AudioClock::BBT);
- secondary_clock.set_name ("TransportClockDisplay");
-
primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
/* options */
- auto_return_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_return));
- auto_play_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_play));
- auto_input_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_input));
- click_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_click));
- follow_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_follow));
- punch_in_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_in));
- punch_out_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out));
+ auto_return_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_return));
+ auto_play_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_play));
+ auto_input_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_input));
+ click_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_click));
+ punch_in_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_in));
+ punch_out_button.signal_toggled().connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out));
- preroll_button.unset_flags (Gtk::CAN_FOCUS);
- preroll_button.set_events (preroll_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
+ preroll_button.unset_flags (CAN_FOCUS);
+ preroll_button.set_events (preroll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
preroll_button.set_name ("TransportButton");
- postroll_button.unset_flags (Gtk::CAN_FOCUS);
- postroll_button.set_events (postroll_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
+ postroll_button.unset_flags (CAN_FOCUS);
+ postroll_button.set_events (postroll_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
postroll_button.set_name ("TransportButton");
preroll_clock.set_mode (AudioClock::MinSec);
/* CANNOT bind these to clicked or toggled, must use pressed or released */
solo_alert_button.set_name ("TransportSoloAlert");
- solo_alert_button.pressed.connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
+ solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
auditioning_alert_button.set_name ("TransportAuditioningAlert");
- auditioning_alert_button.pressed.connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
+ auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
alert_box.pack_start (solo_alert_button);
alert_box.pack_start (auditioning_alert_button);
transport_tearoff_hbox.pack_start (goto_start_button, false, false);
transport_tearoff_hbox.pack_start (goto_end_button, false, false);
- Gtk::Frame* sframe = manage (new Frame);
- Gtk::VBox* svbox = manage (new VBox);
- Gtk::HBox* shbox = manage (new HBox);
+ Frame* sframe = manage (new Frame);
+ VBox* svbox = manage (new VBox);
+ HBox* shbox = manage (new HBox);
- sframe->set_shadow_type (Gtk::SHADOW_IN);
+ sframe->set_shadow_type (SHADOW_IN);
sframe->add (shuttle_box);
shuttle_box.set_name (X_("ShuttleControl"));
speed_display_box.add (speed_display_label);
- set_size_request_to_display_given_text (speed_display_box, _("stopped"), 2, 2);
speed_display_box.set_name (X_("ShuttleDisplay"));
shuttle_units_button.set_name (X_("ShuttleButton"));
shuttle_units_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked));
shuttle_style_button.set_name (X_("ShuttleButton"));
- shuttle_style_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_style_clicked));
- Gtk::Frame* sdframe = manage (new Frame);
+ vector<string> shuttle_strings;
+ shuttle_strings.push_back (_("sprung"));
+ shuttle_strings.push_back (_("wheel"));
+ set_popdown_strings (shuttle_style_button, shuttle_strings);
+ shuttle_style_button.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::shuttle_style_changed));
+
+ Frame* sdframe = manage (new Frame);
- sdframe->set_shadow_type (Gtk::SHADOW_IN);
+ sdframe->set_shadow_type (SHADOW_IN);
sdframe->add (speed_display_box);
+ positional_sync_strings = internationalize (psync_strings);
+
+ set_popdown_strings (sync_option_combo, positional_sync_strings);
+ sync_option_combo.set_active_text (positional_sync_strings.front());
+ sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed));
+
shbox->pack_start (*sdframe, false, false);
shbox->pack_start (shuttle_units_button, true, true);
shbox->pack_start (shuttle_style_button, false, false);
transport_tearoff_hbox.pack_start (primary_clock, false, false, 5);
transport_tearoff_hbox.pack_start (secondary_clock, false, false, 5);
+ transport_tearoff_hbox.pack_start (sync_option_combo, false, false);
+ transport_tearoff_hbox.pack_start (time_master_button, false, false);
transport_tearoff_hbox.pack_start (punch_in_button, false, false);
transport_tearoff_hbox.pack_start (punch_out_button, false, false);
transport_tearoff_hbox.pack_start (auto_input_button, false, false);
transport_tearoff_hbox.pack_start (auto_return_button, false, false);
transport_tearoff_hbox.pack_start (auto_play_button, false, false);
transport_tearoff_hbox.pack_start (click_button, false, false);
- transport_tearoff_hbox.pack_start (follow_button, false, false);
/* desensitize */
set_transport_sensitivity (false);
- /* catch up with editor state */
-
- follow_changed ();
-
// transport_tearoff_hbox.pack_start (preroll_button, false, false);
// transport_tearoff_hbox.pack_start (preroll_clock, false, false);
{
ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
- big_clock_window = new BigClockWindow;
+ big_clock_window = new Window (WINDOW_TOPLEVEL);
big_clock_window->set_border_width (0);
big_clock_window->add (big_clock);
big_clock_window->set_title (_("ardour: clock"));
-
- big_clock_window->delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(big_clock_window)));
- big_clock_window->realize.connect (mem_fun(*this, &ARDOUR_UI::big_clock_realize));
- big_clock_window->size_allocate.connect (mem_fun(*this, &ARDOUR_UI::big_clock_size_event));
-
- big_clock_window->Hiding.connect (mem_fun(*this, &ARDOUR_UI::big_clock_hiding));
-}
+ big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_MENU);
+ big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+ big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-void
-ARDOUR_UI::big_clock_size_event (GtkAllocation *alloc)
-{
- return;
+ manage_window (*big_clock_window);
}
void
-ARDOUR_UI::big_clock_realize ()
+ARDOUR_UI::manage_window (Window& win)
{
- big_clock_window->get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH|GDK_DECOR_MAXIMIZE|GDK_DECOR_MINIMIZE));
+ win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win));
+ win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
+ win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
}
void
-ARDOUR_UI::detach_tearoff (Gtk::Box* b, Gtk::Widget* w)
+ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
{
- editor->ensure_float (*transport_tearoff->tearoff_window());
+// editor->ensure_float (transport_tearoff->tearoff_window());
b->remove (*w);
}
void
-ARDOUR_UI::reattach_tearoff (Gtk::Box* b, Gtk::Widget* w, int32_t n)
+ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n)
{
b->pack_start (*w);
b->reorder_child (*w, n);
if (session->soloing()) {
if (onoff) {
- solo_alert_button.set_state (GTK_STATE_ACTIVE);
+ solo_alert_button.set_state (STATE_ACTIVE);
} else {
- solo_alert_button.set_state (Gtk::STATE_NORMAL);
+ solo_alert_button.set_state (STATE_NORMAL);
}
} else {
solo_alert_button.set_active (false);
- solo_alert_button.set_state (Gtk::STATE_NORMAL);
+ solo_alert_button.set_state (STATE_NORMAL);
}
}
if (session->is_auditioning()) {
if (onoff) {
- auditioning_alert_button.set_state (GTK_STATE_ACTIVE);
+ auditioning_alert_button.set_state (STATE_ACTIVE);
} else {
- auditioning_alert_button.set_state (Gtk::STATE_NORMAL);
+ auditioning_alert_button.set_state (STATE_NORMAL);
}
} else {
auditioning_alert_button.set_active (false);
- auditioning_alert_button.set_state (Gtk::STATE_NORMAL);
+ auditioning_alert_button.set_state (STATE_NORMAL);
}
}
switch (ev->button) {
case 1:
- Gtk::Main::grab_add (shuttle_box);
+ shuttle_box.add_modal_grab ();
shuttle_grabbed = true;
mouse_shuttle (ev->x, true);
break;
case 3:
return TRUE;
break;
-
- case 4:
- break;
- case 5:
- break;
}
return TRUE;
case 1:
mouse_shuttle (ev->x, true);
shuttle_grabbed = false;
- Gtk::Main::grab_remove (shuttle_box);
+ shuttle_box.remove_modal_grab ();
if (shuttle_behaviour == Sprung) {
shuttle_fract = SHUTTLE_FRACT_SPEED1;
session->request_transport_speed (1.0);
gint
ARDOUR_UI::mouse_shuttle (double x, bool force)
{
- double half_width = shuttle_box.width() / 2.0;
+ double half_width = shuttle_box.get_width() / 2.0;
double distance = x - half_width;
if (distance > 0) {
ARDOUR_UI::shuttle_box_expose (GdkEventExpose* event)
{
gint x;
- Gdk_Window win (shuttle_box.get_window());
+ Glib::RefPtr<Gdk::Window> win (shuttle_box.get_window());
/* redraw the background */
- win.draw_rectangle (shuttle_box.get_style()->get_bg_gc (shuttle_box.get_state()),
- true,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ win->draw_rectangle (shuttle_box.get_style()->get_bg_gc (shuttle_box.get_state()),
+ true,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
- x = (gint) floor ((shuttle_box.width() / 2.0) + (0.5 * (shuttle_box.width() * shuttle_fract)));
+ x = (gint) floor ((shuttle_box.get_width() / 2.0) + (0.5 * (shuttle_box.get_width() * shuttle_fract)));
/* draw line */
- win.draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
- x,
- 0,
- x,
- shuttle_box.height());
+ win->draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
+ x,
+ 0,
+ x,
+ shuttle_box.get_height());
return TRUE;
}
-void
-ARDOUR_UI::shuttle_style_clicked ()
-{
- shuttle_style_menu.popup (1, 0);
-}
-
void
ARDOUR_UI::shuttle_unit_clicked ()
{
- shuttle_unit_menu.popup (1, 0);
+ if (shuttle_unit_menu == 0) {
+ shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
+ }
+ shuttle_unit_menu->popup (1, 0);
}
void
{
switch ((shuttle_units = u)) {
case Percentage:
- static_cast<Gtk::Label*>(shuttle_units_button.get_child())->set_text ("% ");
+ static_cast<Label*>(shuttle_units_button.get_child())->set_text ("% ");
break;
case Semitones:
- static_cast<Gtk::Label*>(shuttle_units_button.get_child())->set_text (_("st"));
+ static_cast<Label*>(shuttle_units_button.get_child())->set_text (_("st"));
break;
}
}
+void
+ARDOUR_UI::shuttle_style_changed ()
+{
+ ustring str = shuttle_style_button.get_active_text ();
+
+ if (str == _("sprung")) {
+ set_shuttle_behaviour (Sprung);
+ } else if (str == _("wheel")) {
+ set_shuttle_behaviour (Wheel);
+ }
+}
+
+
void
ARDOUR_UI::set_shuttle_behaviour (ShuttleBehaviour b)
{
switch ((shuttle_behaviour = b)) {
case Sprung:
- static_cast<Gtk::Label*>(shuttle_style_button.get_child())->set_text (_("sprung"));
+ shuttle_style_button.set_active_text (_("sprung"));
shuttle_fract = 0.0;
shuttle_box.queue_draw ();
if (session) {
}
break;
case Wheel:
- static_cast<Gtk::Label*>(shuttle_style_button.get_child())->set_text (_("wheel"));
+ shuttle_style_button.set_active_text (_("wheel"));
break;
}
}
ARDOUR_UI::update_speed_display ()
{
if (!session) {
- speed_display_label.set_text (_("stopped"));
+ if (last_speed_displayed != 0) {
+ speed_display_label.set_text (_("stopped"));
+ last_speed_displayed = 0;
+ }
return;
}
char buf[32];
float x = session->transport_speed ();
- if (x != 0) {
- if (shuttle_units == Percentage) {
- snprintf (buf, sizeof (buf), "%.4f", x);
- } else {
- if (x < 0) {
- snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x));
+ if (x != last_speed_displayed) {
+
+ if (x != 0) {
+ if (shuttle_units == Percentage) {
+ snprintf (buf, sizeof (buf), "%.4f", x);
} else {
- snprintf (buf, sizeof (buf), "> %.1f", 12.0 * fast_log2 (x));
+ if (x < 0) {
+ snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x));
+ } else {
+ snprintf (buf, sizeof (buf), "> %.1f", 12.0 * fast_log2 (x));
+ }
}
+ speed_display_label.set_text (buf);
+ } else {
+ speed_display_label.set_text (_("stopped"));
}
- speed_display_label.set_text (buf);
- } else {
- speed_display_label.set_text (_("stopped"));
+
+ last_speed_displayed = x;
}
}
void
ARDOUR_UI::set_transport_sensitivity (bool yn)
{
- goto_start_button.set_sensitive (yn);
- goto_end_button.set_sensitive (yn);
- roll_button.set_sensitive (yn);
- stop_button.set_sensitive (yn);
- play_selection_button.set_sensitive (yn);
- rec_button.set_sensitive (yn);
- auto_loop_button.set_sensitive (yn);
+ ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn);
shuttle_box.set_sensitive (yn);
}
+
+void
+ARDOUR_UI::editor_realized ()
+{
+ set_size_request_to_display_given_text (speed_display_box, _("stopped"), 2, 2);
+ /* XXX: this should really be saved in instant.xml or something similar and restored from there */
+ shuttle_style_button.set_active_text (_("sprung"));
+ const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button
+ set_size_request_to_display_given_text (shuttle_style_button, _("sprung"), 2+FUDGE, 10);
+}
+
+void
+ARDOUR_UI::sync_option_changed ()
+{
+ string which;
+
+ if (session == 0) {
+ return;
+ }
+
+ which = sync_option_combo.get_active_text();
+
+ if (which == positional_sync_strings[Session::None]) {
+ session->request_slave_source (Session::None);
+ } else if (which == positional_sync_strings[Session::MTC]) {
+ session->request_slave_source (Session::MTC);
+ } else if (which == positional_sync_strings[Session::JACK]) {
+ session->request_slave_source (Session::JACK);
+ }
+}
projects / ardour.git / blobdiff