along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <fcntl.h>
#include <cmath>
#include <sigc++/bind.h>
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/fastlog.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/fastlog.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/tearoff.h>
-#include <ardour/audioengine.h>
-#include <ardour/ardour.h>
-#include <ardour/route.h>
+#include "ardour/audioengine.h"
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/route.h"
#include "ardour_ui.h"
+#include "keyboard.h"
#include "public_editor.h"
#include "audio_clock.h"
#include "actions.h"
#include "utils.h"
+#include "theme_manager.h"
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Glib;
setup_clock ();
setup_transport();
- setup_adjustables ();
build_menu_bar ();
- top_packer.pack_start (menu_bar_base, false, false);
- top_packer.pack_start (transport_frame, false, false);
+ theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
+
+#ifdef TOP_MENUBAR
+ HBox* status_bar_packer = manage (new HBox);
+
+ status_bar_label.set_size_request (300, -1);
+ status_bar_packer->pack_start (status_bar_label, true, true, 6);
+ status_bar_packer->pack_start (error_log_button, false, false);
+
+ error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors));
+
+ editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true);
+ editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6);
+#else
+ top_packer.pack_start (menu_bar_base, false, false);
+#endif
+
+ top_packer.pack_start (transport_frame, false, false);
editor->add_toplevel_controls (top_packer);
return 0;
}
-void
-ARDOUR_UI::setup_adjustables ()
+ void
+ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
{
- adjuster_table.set_homogeneous (true);
-
- online_control_strings.push_back (_("MMC + Local"));
- online_control_strings.push_back (_("MMC"));
- online_control_strings.push_back (_("Local"));
+ ustring text;
- online_control_button = new GlobalClickBox ("CONTROL",
- online_control_strings);
+ UI::display_message (prefix, prefix_len, ptag, mtag, msg);
+#ifdef TOP_MENUBAR
- 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_strings.push_back ("3");
- mmc_id_strings.push_back ("4");
- mmc_id_strings.push_back ("5");
- mmc_id_strings.push_back ("6");
- mmc_id_strings.push_back ("7");
- mmc_id_strings.push_back ("8");
- mmc_id_strings.push_back ("9");
-
- mmc_id_button = new GlobalClickBox (_("MMC ID"), mmc_id_strings);
+ if (strcmp (prefix, _("[ERROR]: ")) == 0) {
+ text = "<span color=\"red\" weight=\"bold\">";
+ } else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
+ text = "<span color=\"yellow\" weight=\"bold\">";
+ } else if (strcmp (prefix, _("[INFO]: ")) == 0) {
+ text = "<span color=\"green\" weight=\"bold\">";
+ } else {
+ text = "<span color=\"white\" weight=\"bold\">???";
+ }
- mmc_id_button->adjustment.signal_value_changed().connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted));
+ text += prefix;
+ text += "</span>";
+ text += msg;
- 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);
+ status_bar_label.set_markup (text);
+#endif
}
void
ARDOUR_UI::transport_stopped ()
{
- stop_button.set_active (true);
+ stop_button.set_visual_state (1);
- roll_button.set_active (false);
- play_selection_button.set_active (false);
- auto_loop_button.set_active (false);
+ roll_button.set_visual_state (0);
+ play_selection_button.set_visual_state (0);
+ auto_loop_button.set_visual_state (0);
shuttle_fract = 0;
shuttle_box.queue_draw ();
update_disk_space ();
}
-static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
-
void
ARDOUR_UI::transport_rolling ()
{
- stop_button.set_active (false);
+ stop_button.set_visual_state (0);
if (session->get_play_range()) {
+ play_selection_button.set_visual_state (1);
+ roll_button.set_visual_state (0);
+ auto_loop_button.set_visual_state (0);
- play_selection_button.set_active (true);
- roll_button.set_active (false);
- auto_loop_button.set_active (false);
-
- } else if (session->get_auto_loop ()) {
-
- auto_loop_button.set_active (true);
- play_selection_button.set_active (false);
- roll_button.set_active (false);
+ } else if (session->get_play_loop ()) {
+ auto_loop_button.set_visual_state (1);
+ play_selection_button.set_visual_state (0);
+ roll_button.set_visual_state (0);
} else {
- roll_button.set_active (true);
- play_selection_button.set_active (false);
- auto_loop_button.set_active (false);
+ roll_button.set_visual_state (1);
+ play_selection_button.set_visual_state (0);
+ auto_loop_button.set_visual_state (0);
}
/* reset shuttle controller */
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);
+ stop_button.set_visual_state (0);
+ roll_button.set_visual_state (1);
+ play_selection_button.set_visual_state (0);
+ auto_loop_button.set_visual_state (0);
}
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);
+ stop_button.set_visual_state (0);
+ roll_button.set_visual_state (1);
+ play_selection_button.set_visual_state (0);
+ auto_loop_button.set_visual_state (0);
}
void
{
transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
transport_tearoff->set_name ("TransportBase");
+ transport_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
+
+ if (Profile->get_sae()) {
+ transport_tearoff->set_can_be_torn_off (false);
+ }
transport_hbox.pack_start (*transport_tearoff, true, false);
play_selection_button.set_name ("TransportButton");
rec_button.set_name ("TransportRecButton");
auto_loop_button.set_name ("TransportButton");
+
auto_return_button.set_name ("TransportButton");
auto_play_button.set_name ("TransportButton");
auto_input_button.set_name ("TransportButton");
click_button.set_name ("TransportButton");
time_master_button.set_name ("TransportButton");
- vector<Gdk::Color> colors;
- Gdk::Color c;
-
- /* record button has 3 color states, so we set 2 extra here */
- set_color(c, rgba_from_style ("TransportRecButton", 0xff, 0, 0, 0, "bg", Gtk::STATE_PRELIGHT, false ));
- colors.push_back (c);
-
- set_color(c, rgba_from_style ("TransportRecButton", 0xff, 0, 0, 0, "bg", Gtk::STATE_ACTIVE, false ));
- colors.push_back (c);
-
- rec_button.set_colors (colors);
- colors.clear ();
-
- /* other buttons get 2 color states, so add one here */
- set_color(c, rgba_from_style ("TransportButton", 0x7f, 0xff, 0x7f, 0, "bg", Gtk::STATE_ACTIVE, false ));
- 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);
+ stop_button.set_size_request(29, -1);
+ roll_button.set_size_request(29, -1);
+ auto_loop_button.set_size_request(29, -1);
+ play_selection_button.set_size_request(29, -1);
+ goto_start_button.set_size_request(29, -1);
+ goto_end_button.set_size_request(29, -1);
+ rec_button.set_size_request(29, -1);
Widget* w;
- stop_button.set_active (true);
-
- w = manage (new Image (Stock::MEDIA_PREVIOUS, ICON_SIZE_BUTTON));
+ stop_button.set_visual_state (1);
+
+ w = manage (new Image (get_icon (X_("transport_start"))));
w->show();
goto_start_button.add (*w);
- w = manage (new Image (Stock::MEDIA_NEXT, ICON_SIZE_BUTTON));
+ w = manage (new Image (get_icon (X_("transport_end"))));
w->show();
goto_end_button.add (*w);
- w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+ w = manage (new Image (get_icon (X_("transport_play"))));
w->show();
roll_button.add (*w);
- w = manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON));
+ w = manage (new Image (get_icon (X_("transport_stop"))));
w->show();
stop_button.add (*w);
- w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+ w = manage (new Image (get_icon (X_("transport_range"))));
w->show();
play_selection_button.add (*w);
- w = manage (new Image (Stock::MEDIA_RECORD, ICON_SIZE_BUTTON));
+ w = manage (new Image (get_icon (X_("transport_record"))));
w->show();
rec_button.add (*w);
- w = manage (new Image (get_xpm("loop.xpm")));
+ w = manage (new Image (get_icon (X_("transport_loop"))));
w->show();
auto_loop_button.add (*w);
ARDOUR_UI::instance()->tooltips().set_tip (goto_start_button, _("Go to start of session"));
ARDOUR_UI::instance()->tooltips().set_tip (goto_end_button, _("Go to end of session"));
ARDOUR_UI::instance()->tooltips().set_tip (auto_loop_button, _("Play loop range"));
+
ARDOUR_UI::instance()->tooltips().set_tip (auto_return_button, _("Return to last playback start when stopped"));
ARDOUR_UI::instance()->tooltips().set_tip (auto_play_button, _("Start playback after any locate"));
ARDOUR_UI::instance()->tooltips().set_tip (auto_input_button, _("Be sensible about input monitoring"));
ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed"));
shuttle_box.set_flags (CAN_FOCUS);
- shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK);
+ shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
shuttle_box.set_size_request (100, 15);
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_scroll_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll));
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 (primary_clock, &AudioClock::set), false));
- ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), false));
-
- primary_clock.set_mode (AudioClock::SMPTE);
- secondary_clock.set_mode (AudioClock::BBT);
+ ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 'p'));
+ ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 's'));
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));
+ big_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock"));
ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock"));
ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
- 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 (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);
auditioning_alert_button.set_name ("TransportAuditioningAlert");
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);
+ tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
+ tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
+
+ alert_box.pack_start (solo_alert_button, false, false);
+ alert_box.pack_start (auditioning_alert_button, false, false);
- transport_tearoff_hbox.set_border_width (5);
+ transport_tearoff_hbox.set_border_width (3);
transport_tearoff_hbox.pack_start (goto_start_button, false, false);
transport_tearoff_hbox.pack_start (goto_end_button, false, false);
speed_display_box.add (speed_display_label);
speed_display_box.set_name (X_("ShuttleDisplay"));
+ set_size_request_to_display_given_text (speed_display_label, X_("> 24.0"), 2, 2);
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.set_name (X_("ShuttleStyleButton"));
vector<string> shuttle_strings;
shuttle_strings.push_back (_("sprung"));
shuttle_strings.push_back (_("wheel"));
- set_popdown_strings (shuttle_style_button, shuttle_strings);
+ set_popdown_strings (shuttle_style_button, shuttle_strings, true);
shuttle_style_button.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::shuttle_style_changed));
Frame* sdframe = manage (new Frame);
sdframe->add (speed_display_box);
mtc_port_changed ();
- sync_option_combo.set_active_text (positional_sync_strings.front());
sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed));
+ // XXX HOW TO USE set_popdown_strings() and combo_fudge with this when we don't know
+ // the real strings till later?
+ set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 4+COMBO_FUDGE, 10);
shbox->pack_start (*sdframe, false, false);
shbox->pack_start (shuttle_units_button, true, true);
svbox->pack_start (*sframe, false, false);
svbox->pack_start (*shbox, false, false);
- transport_tearoff_hbox.pack_start (*svbox, false, false, 5);
+ transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
transport_tearoff_hbox.pack_start (auto_loop_button, false, false);
- transport_tearoff_hbox.pack_start (play_selection_button, false, false);
+ if (!Profile->get_sae()) {
+ transport_tearoff_hbox.pack_start (play_selection_button, false, false);
+ }
transport_tearoff_hbox.pack_start (roll_button, false, false);
transport_tearoff_hbox.pack_start (stop_button, false, false);
- transport_tearoff_hbox.pack_start (rec_button, false, false, 10);
-
- 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 (rec_button, false, false, 6);
+
+ HBox* clock_box = manage (new HBox);
+ clock_box->pack_start (primary_clock, false, false);
+ if (!ARDOUR::Profile->get_small_screen()) {
+ clock_box->pack_start (secondary_clock, false, false);
+ }
+
+ if (!Profile->get_sae()) {
+ VBox* time_controls_box = manage (new VBox);
+ time_controls_box->pack_start (sync_option_combo, false, false);
+ time_controls_box->pack_start (time_master_button, false, false);
+ clock_box->pack_start (*time_controls_box, false, false, 1);
+ }
+
+ transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
+
+ HBox* toggle_box = manage(new HBox);
+
+ VBox* punch_box = manage (new VBox);
+ punch_box->pack_start (punch_in_button, false, false);
+ punch_box->pack_start (punch_out_button, false, false);
+ toggle_box->pack_start (*punch_box, false, false);
+
+ VBox* auto_box = manage (new VBox);
+ auto_box->pack_start (auto_play_button, false, false);
+ auto_box->pack_start (auto_return_button, false, false);
+ toggle_box->pack_start (*auto_box, false, false);
+
+ VBox* io_box = manage (new VBox);
+ io_box->pack_start (auto_input_button, false, false);
+ io_box->pack_start (click_button, false, false);
+ toggle_box->pack_start (*io_box, false, false);
/* desensitize */
set_transport_sensitivity (false);
-// transport_tearoff_hbox.pack_start (preroll_button, false, false);
-// transport_tearoff_hbox.pack_start (preroll_clock, false, false);
+// toggle_box->pack_start (preroll_button, false, false);
+// toggle_box->pack_start (preroll_clock, false, false);
-// transport_tearoff_hbox.pack_start (postroll_button, false, false);
-// transport_tearoff_hbox.pack_start (postroll_clock, false, false);
-
- transport_tearoff_hbox.pack_start (alert_box, false, false, 5);
-}
+// toggle_box->pack_start (postroll_button, false, false);
+// toggle_box->pack_start (postroll_clock, false, false);
-void
-ARDOUR_UI::setup_clock ()
-{
- ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
-
- big_clock_window = new Window (WINDOW_TOPLEVEL);
+ transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
+ transport_tearoff_hbox.pack_start (alert_box, false, false);
- big_clock_window->set_border_width (0);
- big_clock_window->add (big_clock);
- big_clock_window->set_title (_("ardour: clock"));
- 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")));
-
- manage_window (*big_clock_window);
+ if (Profile->get_sae()) {
+ Image* img = manage (new Image ((::get_icon (X_("sae")))));
+ transport_tearoff_hbox.pack_end (*img, false, false, 6);
+ }
}
void
void
ARDOUR_UI::auditioning_changed (bool onoff)
{
- Gtkmm2ext::UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
+ UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
}
void
build_shuttle_context_menu ();
}
- shuttle_context_menu->popup (1, 0);
+ shuttle_context_menu->popup (1, gtk_get_current_event_time());
}
void
return true;
}
+ if (shuttle_controller_binding_proxy.button_press_handler (ev)) {
+ return true;
+ }
+
if (Keyboard::is_context_menu_event (ev)) {
show_shuttle_context_menu ();
return true;
mouse_shuttle (ev->x, true);
shuttle_grabbed = false;
shuttle_box.remove_modal_grab ();
- if (shuttle_behaviour == Sprung) {
- shuttle_fract = SHUTTLE_FRACT_SPEED1;
- session->request_transport_speed (1.0);
+ if (Config->get_shuttle_behaviour() == Sprung) {
+ if (session->config.get_auto_play() || roll_button.get_visual_state()) {
+ shuttle_fract = SHUTTLE_FRACT_SPEED1;
+ session->request_transport_speed (1.0);
+ stop_button.set_visual_state (0);
+ roll_button.set_visual_state (1);
+ } else {
+ shuttle_fract = 0;
+ session->request_transport_speed (0.0);
+ }
shuttle_box.queue_draw ();
}
return true;
if (session->transport_rolling()) {
shuttle_fract = SHUTTLE_FRACT_SPEED1;
session->request_transport_speed (1.0);
+ stop_button.set_visual_state (0);
+ roll_button.set_visual_state (1);
} else {
shuttle_fract = 0;
}
return true;
case 3:
+ default:
return true;
+
+ }
+
+ use_shuttle_fract (true);
+
+ return true;
+}
+
+gint
+ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev)
+{
+ if (!session) {
+ return true;
+ }
+
+ switch (ev->direction) {
- case 4:
+ case GDK_SCROLL_UP:
shuttle_fract += 0.005;
break;
- case 5:
+ case GDK_SCROLL_DOWN:
shuttle_fract -= 0.005;
break;
+ default:
+ /* scroll left/right */
+ return false;
}
use_shuttle_fract (true);
return true;
}
+void
+ARDOUR_UI::set_shuttle_fract (double f)
+{
+ shuttle_fract = f;
+ use_shuttle_fract (false);
+}
+
void
ARDOUR_UI::use_shuttle_fract (bool force)
{
- struct timeval now;
- struct timeval diff;
+ microseconds_t now = get_microseconds();
/* do not attempt to submit a motion-driven transport speed request
more than once per process cycle.
*/
- gettimeofday (&now, 0);
- timersub (&now, &last_shuttle_request, &diff);
-
- if (!force && (diff.tv_usec + (diff.tv_sec * 1000000)) < engine->usecs_per_cycle()) {
+ if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) {
return;
}
last_shuttle_request = now;
- bool neg = (shuttle_fract < 0.0);
+ if (Config->get_shuttle_units() == Semitones) {
+
+ const double step = 1.0 / 24.0; // range is 24 semitones up & down
+ double semitones;
+ double speed;
+
+ semitones = round (shuttle_fract / step);
+ speed = pow (2.0, (semitones / 12.0));
- double fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1
+ session->request_transport_speed (speed);
- if (neg) {
- fract = -fract;
+ } else {
+
+ bool neg;
+ double fract;
+
+ neg = (shuttle_fract < 0.0);
+
+ fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1
+
+ if (neg) {
+ fract = -fract;
+ }
+
+ session->request_transport_speed (shuttle_max_speed * fract);
}
- session->request_transport_speed (shuttle_max_speed * fract); // Formula A2
shuttle_box.queue_draw ();
}
if (shuttle_unit_menu == 0) {
shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
}
- shuttle_unit_menu->popup (1, 0);
-}
-
-void
-ARDOUR_UI::set_shuttle_units (ShuttleUnits u)
-{
- switch ((shuttle_units = u)) {
- case Percentage:
- static_cast<Label*>(shuttle_units_button.get_child())->set_text ("% ");
- break;
- case Semitones:
- static_cast<Label*>(shuttle_units_button.get_child())->set_text (_("st"));
- break;
- }
+ shuttle_unit_menu->popup (1, gtk_get_current_event_time());
}
void
ustring str = shuttle_style_button.get_active_text ();
if (str == _("sprung")) {
- set_shuttle_behaviour (Sprung);
+ Config->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:
- shuttle_style_button.set_active_text (_("sprung"));
- shuttle_fract = 0.0;
- shuttle_box.queue_draw ();
- if (session) {
- if (session->transport_rolling()) {
- shuttle_fract = SHUTTLE_FRACT_SPEED1;
- session->request_transport_speed (1.0);
- }
- }
- break;
- case Wheel:
- shuttle_style_button.set_active_text (_("wheel"));
- break;
+ Config->set_shuttle_behaviour (Wheel);
}
}
{
if (!session) {
if (last_speed_displayed != 0) {
- speed_display_label.set_text (_("stopped"));
+ speed_display_label.set_text (_("stop"));
last_speed_displayed = 0;
}
return;
if (x != last_speed_displayed) {
if (x != 0) {
- if (shuttle_units == Percentage) {
- snprintf (buf, sizeof (buf), "%.4f", x);
+ if (Config->get_shuttle_units() == Percentage) {
+ snprintf (buf, sizeof (buf), "%.2f", x);
} else {
+
if (x < 0) {
- snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x));
+ snprintf (buf, sizeof (buf), "< %d", (int) round (12.0 * fast_log2 (-x)));
} else {
- snprintf (buf, sizeof (buf), "> %.1f", 12.0 * fast_log2 (x));
+ snprintf (buf, sizeof (buf), "> %d", (int) round (12.0 * fast_log2 (x)));
}
}
speed_display_label.set_text (buf);
} else {
- speed_display_label.set_text (_("stopped"));
+ speed_display_label.set_text (_("stop"));
}
last_speed_displayed = x;
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);
+ Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+
+ set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2);
+ reset_dpi ();
}
void
ARDOUR_UI::sync_option_changed ()
{
- string which;
-
- if (session == 0) {
- return;
+ if (session) {
+ ustring txt = sync_option_combo.get_active_text ();
+ if (txt.length()) {
+ session->request_slave_source (string_to_slave_source (txt));
+ }
}
-
- 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);
- }
}
void
projects / ardour.git / blobdiff