[Demudi-commits] r1516 - in ardour/trunk/debian: . patches
free-guest at alioth.debian.org
free-guest at alioth.debian.org
Wed Jul 25 15:52:17 UTC 2007
Author: free-guest
Date: 2007-07-25 15:52:17 +0000 (Wed, 25 Jul 2007)
New Revision: 1516
Added:
ardour/trunk/debian/patches/80_ardourino.patch
Modified:
ardour/trunk/debian/changelog
ardour/trunk/debian/patches/series
Log:
releasing version 1:2.0.3-2
Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog 2007-07-23 19:31:55 UTC (rev 1515)
+++ ardour/trunk/debian/changelog 2007-07-25 15:52:17 UTC (rev 1516)
@@ -1,3 +1,9 @@
+ardour (1:2.0.3-2) unstable; urgency=low
+
+ * Added "ardourino" patch, for displays with 800x600 resolutions
+
+ -- Free Ekanayaka <freee at debian.org> Thu, 12 Jul 2007 14:44:31 +0200
+
ardour (1:2.0.3-1) unstable; urgency=low
* New upstream release (Closes: #427739). Note that the source is still
Added: ardour/trunk/debian/patches/80_ardourino.patch
===================================================================
--- ardour/trunk/debian/patches/80_ardourino.patch (rev 0)
+++ ardour/trunk/debian/patches/80_ardourino.patch 2007-07-25 15:52:17 UTC (rev 1516)
@@ -0,0 +1,697 @@
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui2.cc ardour-2.0.3/gtk2_ardour/ardour_ui2.cc
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui2.cc 2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui2.cc 2007-07-16 13:09:28.000000000 +0200
+@@ -98,7 +98,9 @@
+ shuttle_fract = 0;
+ shuttle_box.queue_draw ();
+
+- update_disk_space ();
++ if (!ardourino) {
++ update_disk_space ();
++ }
+ }
+
+ void
+@@ -179,13 +181,16 @@
+ 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");
+- punch_in_button.set_name ("TransportButton");
+- punch_out_button.set_name ("TransportButton");
+- click_button.set_name ("TransportButton");
+- time_master_button.set_name ("TransportButton");
++ if (!ardourino) {
++ update_disk_space ();
++ auto_return_button.set_name ("TransportButton");
++ auto_play_button.set_name ("TransportButton");
++ auto_input_button.set_name ("TransportButton");
++ punch_in_button.set_name ("TransportButton");
++ punch_out_button.set_name ("TransportButton");
++ click_button.set_name ("TransportButton");
++ time_master_button.set_name ("TransportButton");
++ }
+
+ stop_button.set_size_request(29, -1);
+ roll_button.set_size_request(29, -1);
+@@ -237,8 +242,10 @@
+ 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);
++ if (!ardourino) {
++ 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"));
+@@ -247,14 +254,18 @@
+ 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 (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 (sync_option_combo, _("Positional sync source"));
+- ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?"));
++
++ if (!ardourino) {
++ 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 (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 (sync_option_combo, _("Positional sync source"));
++ 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 (speed_display_box, _("Current transport speed"));
+@@ -280,12 +291,14 @@
+ ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock"));
+ ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock"));
+
+- ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
+- ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
+- ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
+- ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
+- ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
+- ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
++ if (!ardourino) {
++ ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
++ ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
++ ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
++ ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
++ ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
++ ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
++ }
+
+ preroll_button.set_name ("TransportButton");
+ postroll_button.set_name ("TransportButton");
+@@ -299,16 +312,18 @@
+
+ /* CANNOT bind these to clicked or toggled, must use pressed or released */
+
+- solo_alert_button.set_name ("TransportSoloAlert");
+- solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
+- auditioning_alert_button.set_name ("TransportAuditioningAlert");
+- auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
++ if (!ardourino) {
++ solo_alert_button.set_name ("TransportSoloAlert");
++ solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
++ auditioning_alert_button.set_name ("TransportAuditioningAlert");
++ auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
+
+- 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"));
++ 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);
++ alert_box.pack_start (solo_alert_button, false, false);
++ alert_box.pack_start (auditioning_alert_button, false, false);
++ }
+
+ transport_tearoff_hbox.set_border_width (3);
+
+@@ -344,10 +359,13 @@
+ sdframe->add (speed_display_box);
+
+ mtc_port_changed ();
+- sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed));
++ if (!ardourino) {
++ sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed));
++ }
+ const guint32 FUDGE = 25; // Combo's are stupid - they steal space from the entry for the button
+- set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 2+FUDGE, 10);
+-
++ if (!ardourino) {
++ set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 2+FUDGE, 10);
++ }
+ shbox->pack_start (*sdframe, false, false);
+ shbox->pack_start (shuttle_units_button, true, true);
+ shbox->pack_start (shuttle_style_button, false, false);
+@@ -369,26 +387,34 @@
+ clock_box->pack_start (secondary_clock, false, false);
+ }
+ 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);
++ if (!ardourino) {
++ 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);
++ if (!ardourino) {
++ 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);
++ if (!ardourino) {
++ 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);
++ if (!ardourino) {
++ 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 */
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui.cc ardour-2.0.3/gtk2_ardour/ardour_ui.cc
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui.cc 2007-06-29 17:20:45.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui.cc 2007-07-16 13:16:02.000000000 +0200
+@@ -147,7 +147,9 @@
+
+ auditioning_alert_button (_("AUDITION")),
+ solo_alert_button (_("SOLO")),
+- shown_flag (false)
++
++ shown_flag (false),
++ ardourino(GTK_ARDOUR::ardourino)
+ {
+ using namespace Gtk::Menu_Helpers;
+
+@@ -220,7 +222,9 @@
+ engine->Stopped.connect (mem_fun(*this, &ARDOUR_UI::engine_stopped));
+ engine->Running.connect (mem_fun(*this, &ARDOUR_UI::engine_running));
+ engine->Halted.connect (mem_fun(*this, &ARDOUR_UI::engine_halted));
+- engine->SampleRateChanged.connect (mem_fun(*this, &ARDOUR_UI::update_sample_rate));
++ if (!ardourino) {
++ engine->SampleRateChanged.connect (mem_fun(*this, &ARDOUR_UI::update_sample_rate));
++ }
+
+ ActionManager::init ();
+ new_session_dialog = new NewSessionDialog();
+@@ -271,12 +275,14 @@
+
+ /* start the time-of-day-clock */
+
+- update_wall_clock ();
+- Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+-
+- update_disk_space ();
+- update_cpu_load ();
+- update_sample_rate (engine->frame_rate());
++ if (!ardourino) {
++ update_wall_clock ();
++ Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
++
++ update_disk_space ();
++ update_cpu_load ();
++ update_sample_rate (engine->frame_rate());
++ }
+
+ starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
+ stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
+@@ -639,9 +645,11 @@
+ gint
+ ARDOUR_UI::every_second ()
+ {
+- update_cpu_load ();
+- update_buffer_load ();
+- update_disk_space ();
++ if (!ardourino) {
++ update_cpu_load ();
++ update_buffer_load ();
++ update_disk_space ();
++ }
+ return TRUE;
+ }
+
+@@ -1435,7 +1443,9 @@
+ ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
+
+- update_sample_rate (0);
++ if (!ardourino) {
++ update_sample_rate (0);
++ }
+
+ MessageDialog msg (*editor,
+ _("\
+@@ -2512,7 +2522,9 @@
+ msg.run ();
+ }
+
+- update_sample_rate (0);
++ if (!ardourino) {
++ update_sample_rate (0);
++ }
+ }
+ }
+
+@@ -2525,7 +2537,9 @@
+ msg.run ();
+ }
+
+- update_sample_rate (0);
++ if (!ardourino) {
++ update_sample_rate (0);
++ }
+ }
+ }
+
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui_dialogs.cc ardour-2.0.3/gtk2_ardour/ardour_ui_dialogs.cc
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_dialogs.cc 2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_dialogs.cc 2007-07-16 13:16:33.000000000 +0200
+@@ -110,8 +110,10 @@
+ setup_session_options ();
+
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
+- Blink.connect (mem_fun(*this, &ARDOUR_UI::solo_blink));
+- Blink.connect (mem_fun(*this, &ARDOUR_UI::audition_blink));
++ if (!ardourino) {
++ Blink.connect (mem_fun(*this, &ARDOUR_UI::solo_blink));
++ Blink.connect (mem_fun(*this, &ARDOUR_UI::audition_blink));
++ }
+
+ /* these are all need to be handled in an RT-safe and MT way, so don't
+ do any GUI work, just queue it for handling by the GUI thread.
+@@ -121,10 +123,11 @@
+
+ /* alert the user to these things happening */
+
+- session->AuditionActive.connect (mem_fun(*this, &ARDOUR_UI::auditioning_changed));
+- session->SoloActive.connect (mem_fun(*this, &ARDOUR_UI::soloing_changed));
+-
+- solo_alert_button.set_active (session->soloing());
++ if (!ardourino) {
++ session->AuditionActive.connect (mem_fun(*this, &ARDOUR_UI::auditioning_changed));
++ session->SoloActive.connect (mem_fun(*this, &ARDOUR_UI::soloing_changed));
++ solo_alert_button.set_active (session->soloing());
++ }
+
+ /* update autochange callback on dirty state changing */
+
+@@ -210,7 +213,9 @@
+ delete session;
+ session = 0;
+
+- update_buffer_load ();
++ if (!ardourino) {
++ update_buffer_load ();
++ }
+
+ return 0;
+ }
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui_ed.cc ardour-2.0.3/gtk2_ardour/ardour_ui_ed.cc
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_ed.cc 2007-06-29 17:16:26.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_ed.cc 2007-07-16 13:18:01.000000000 +0200
+@@ -316,7 +316,9 @@
+ ActionManager::transport_sensitive_actions.push_back (act);
+
+ ActionManager::register_toggle_action (transport_actions, X_("ToggleVideoSync"), _("Sync startup to video"), mem_fun(*this, &ARDOUR_UI::toggle_video_sync));
+- act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
++ if (!ardourino) {
++ act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
++ }
+ ActionManager::session_sensitive_actions.push_back (act);
+
+ act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
+@@ -612,7 +614,9 @@
+
+ if (ract && ract->get_active()) {
+ engine->request_buffer_size (nframes);
+- update_sample_rate (0);
++ if (!ardourino) {
++ update_sample_rate (0);
++ }
+ }
+ }
+ }
+@@ -703,34 +707,38 @@
+ */
+ Gtk::Settings::get_default()->property_gtk_can_change_accels() = true;
+
+- wall_clock_box.add (wall_clock_label);
+- wall_clock_box.set_name ("WallClock");
+- wall_clock_label.set_name ("WallClock");
+-
+- disk_space_box.add (disk_space_label);
+- disk_space_box.set_name ("WallClock");
+- disk_space_label.set_name ("WallClock");
+-
+- cpu_load_box.add (cpu_load_label);
+- cpu_load_box.set_name ("CPULoad");
+- cpu_load_label.set_name ("CPULoad");
+-
+- buffer_load_box.add (buffer_load_label);
+- buffer_load_box.set_name ("BufferLoad");
+- buffer_load_label.set_name ("BufferLoad");
+-
+- sample_rate_box.add (sample_rate_label);
+- sample_rate_box.set_name ("SampleRate");
+- sample_rate_label.set_name ("SampleRate");
++ if (!ardourino) {
++ wall_clock_box.add (wall_clock_label);
++ wall_clock_box.set_name ("WallClock");
++ wall_clock_label.set_name ("WallClock");
++
++ disk_space_box.add (disk_space_label);
++ disk_space_box.set_name ("WallClock");
++ disk_space_label.set_name ("WallClock");
++
++ cpu_load_box.add (cpu_load_label);
++ cpu_load_box.set_name ("CPULoad");
++ cpu_load_label.set_name ("CPULoad");
++
++ buffer_load_box.add (buffer_load_label);
++ buffer_load_box.set_name ("BufferLoad");
++ buffer_load_label.set_name ("BufferLoad");
++
++ sample_rate_box.add (sample_rate_label);
++ sample_rate_box.set_name ("SampleRate");
++ sample_rate_label.set_name ("SampleRate");
++ }
+
+ menu_hbox.pack_start (*menu_bar, true, true);
+- if (!Profile->get_small_screen()) {
+- menu_hbox.pack_end (wall_clock_box, false, false, 2);
+- menu_hbox.pack_end (disk_space_box, false, false, 4);
+- }
+- menu_hbox.pack_end (cpu_load_box, false, false, 4);
+- menu_hbox.pack_end (buffer_load_box, false, false, 4);
+- menu_hbox.pack_end (sample_rate_box, false, false, 4);
++ if (!ardourino) {
++ if (!Profile->get_small_screen()) {
++ menu_hbox.pack_end (wall_clock_box, false, false, 2);
++ menu_hbox.pack_end (disk_space_box, false, false, 4);
++ }
++ menu_hbox.pack_end (cpu_load_box, false, false, 4);
++ menu_hbox.pack_end (buffer_load_box, false, false, 4);
++ menu_hbox.pack_end (sample_rate_box, false, false, 4);
++ }
+
+ menu_bar_base.set_name ("MainMenuBar");
+ menu_bar_base.add (menu_hbox);
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui.h ardour-2.0.3/gtk2_ardour/ardour_ui.h
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui.h 2007-06-29 17:16:39.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui.h 2007-07-16 13:23:38.000000000 +0200
+@@ -404,6 +404,7 @@
+
+ void sync_option_changed ();
+ void toggle_time_master ();
++
+ void toggle_video_sync ();
+
+ Gtk::DrawingArea shuttle_box;
+@@ -713,6 +714,7 @@
+ void check_memory_locking ();
+
+ void audioengine_setup ();
++ bool ardourino;
+ };
+
+ #endif /* __ardour_gui_h__ */
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/ardour_ui_options.cc ardour-2.0.3/gtk2_ardour/ardour_ui_options.cc
+--- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_options.cc 2007-05-31 23:27:20.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_options.cc 2007-07-16 13:19:17.000000000 +0200
+@@ -501,7 +501,9 @@
+ }
+ positional_sync_strings.push_back (slave_source_to_string (JACK));
+
+- set_popdown_strings (sync_option_combo, positional_sync_strings);
++ if (!ardourino) {
++ set_popdown_strings (sync_option_combo, positional_sync_strings);
++ }
+ }
+
+ void
+@@ -965,7 +967,9 @@
+ } else if (PARAM_IS ("clicking")) {
+ ActionManager::map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
+ } else if (PARAM_IS ("jack-time-master")) {
+- ActionManager::map_some_state ("Transport", "ToggleTimeMaster", &Configuration::get_jack_time_master);
++ if (!ardourino) {
++ ActionManager::map_some_state ("Transport", "ToggleTimeMaster", &Configuration::get_jack_time_master);
++ }
+ } else if (PARAM_IS ("plugins-stop-with-transport")) {
+ ActionManager::map_some_state ("options", "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
+ } else if (PARAM_IS ("latched-record-enable")) {
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/editor.cc ardour-2.0.3/gtk2_ardour/editor.cc
+--- ardour-2.0.3.orig/gtk2_ardour/editor.cc 2007-05-30 19:23:07.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/editor.cc 2007-07-16 13:37:45.000000000 +0200
+@@ -74,6 +74,7 @@
+ #include "canvas_impl.h"
+ #include "actions.h"
+ #include "gui_thread.h"
++#include "opts.h"
+
+ #ifdef FFT_ANALYSIS
+ #include "analysis_window.h"
+@@ -211,8 +212,8 @@
+
+ /* nudge */
+
+- nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true)
+-
++ nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true),
++ ardourino(GTK_ARDOUR::ardourino)
+ {
+ constructed = false;
+
+@@ -2583,38 +2584,40 @@
+
+ /* Edit Cursor / Snap */
+
+- snap_box.set_spacing (1);
+- snap_box.set_border_width (2);
+-
+- snap_type_selector.set_name ("SnapTypeSelector");
+- Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
+- set_popdown_strings (snap_type_selector, snap_type_strings);
+- snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
+- ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
+-
+- snap_mode_selector.set_name ("SnapModeSelector");
+- Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10);
+- set_popdown_strings (snap_mode_selector, snap_mode_strings);
+- snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
+-
+- snap_box.pack_start (edit_cursor_clock, false, false);
+- snap_box.pack_start (snap_mode_selector, false, false);
+- snap_box.pack_start (snap_type_selector, false, false);
+-
++ if (!ardourino) {
++ snap_box.set_spacing (1);
++ snap_box.set_border_width (2);
++
++ snap_type_selector.set_name ("SnapTypeSelector");
++ Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
++ set_popdown_strings (snap_type_selector, snap_type_strings);
++ snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
++ ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
++
++ snap_mode_selector.set_name ("SnapModeSelector");
++ Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10);
++ set_popdown_strings (snap_mode_selector, snap_mode_strings);
++ snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
++
++ snap_box.pack_start (edit_cursor_clock, false, false);
++ snap_box.pack_start (snap_mode_selector, false, false);
++ snap_box.pack_start (snap_type_selector, false, false);
++ }
+
+ /* Nudge */
+
+ HBox *nudge_box = manage (new HBox);
+- nudge_box->set_spacing(1);
+- nudge_box->set_border_width (2);
+-
+- nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false));
+- nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false));
+-
+- nudge_box->pack_start (nudge_backward_button, false, false);
+- nudge_box->pack_start (nudge_forward_button, false, false);
+- nudge_box->pack_start (nudge_clock, false, false);
+-
++ if (!ardourino) {
++ nudge_box->set_spacing(1);
++ nudge_box->set_border_width (2);
++
++ nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false));
++ nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false));
++
++ nudge_box->pack_start (nudge_backward_button, false, false);
++ nudge_box->pack_start (nudge_forward_button, false, false);
++ nudge_box->pack_start (nudge_clock, false, false);
++ }
+
+ /* Pack everything in... */
+
+@@ -2640,9 +2643,11 @@
+ toolbar_hbox.pack_start (*tools_tearoff, false, false);
+
+
+- hbox->pack_start (snap_box, false, false);
++ if (!ardourino) {
++ hbox->pack_start (snap_box, false, false);
+ // hbox->pack_start (zoom_box, false, false);
+- hbox->pack_start (*nudge_box, false, false);
++ hbox->pack_start (*nudge_box, false, false);
++ }
+
+ hbox->show_all ();
+
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/editor.h ardour-2.0.3/gtk2_ardour/editor.h
+--- ardour-2.0.3.orig/gtk2_ardour/editor.h 2007-05-30 19:34:29.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/editor.h 2007-07-16 13:34:47.000000000 +0200
+@@ -1851,6 +1851,7 @@
+ Glib::RefPtr<Gtk::Action> redo_action;
+
+ void history_changed ();
++ bool ardourino;
+ };
+
+ #endif /* __ardour_editor_h__ */
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/mixer_strip.cc ardour-2.0.3/gtk2_ardour/mixer_strip.cc
+--- ardour-2.0.3.orig/gtk2_ardour/mixer_strip.cc 2007-05-31 16:20:09.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/mixer_strip.cc 2007-07-16 13:47:53.000000000 +0200
+@@ -56,6 +56,7 @@
+ #include "io_selector.h"
+ #include "utils.h"
+ #include "gui_thread.h"
++#include "opts.h"
+
+ #include "i18n.h"
+
+@@ -252,11 +253,15 @@
+
+ global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
+- global_vpacker.pack_start (pre_redirect_box, true, true);
++ if (!GTK_ARDOUR::ardourino) {
++ global_vpacker.pack_start (pre_redirect_box, true, true);
++ }
+ global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
+- global_vpacker.pack_start (post_redirect_box, true, true);
++ if (!GTK_ARDOUR::ardourino) {
++ global_vpacker.pack_start (post_redirect_box, true, true);
++ }
+ global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
+@@ -329,8 +334,11 @@
+
+ /* now force an update of all the various elements */
+
+- pre_redirect_box.update();
+- post_redirect_box.update();
++ if (!GTK_ARDOUR::ardourino) {
++ pre_redirect_box.update();
++ post_redirect_box.update();
++ }
++
+ mute_changed (0);
+ solo_changed (0);
+ name_changed (0);
+@@ -397,9 +405,10 @@
+
+ gpm.set_width (w);
+ panners.set_width (w);
+- pre_redirect_box.set_width (w);
+- post_redirect_box.set_width (w);
+-
++ if (!GTK_ARDOUR::ardourino) {
++ pre_redirect_box.set_width (w);
++ post_redirect_box.set_width (w);
++ }
+ _width_owner = owner;
+
+ if (_width == w) {
+@@ -1135,13 +1144,17 @@
+ if (at) {
+ switch (at->freeze_state()) {
+ case AudioTrack::Frozen:
++ if (!GTK_ARDOUR::ardourino) {
+ pre_redirect_box.set_sensitive (false);
+ post_redirect_box.set_sensitive (false);
++ }
+ speed_spinner.set_sensitive (false);
+ break;
+ default:
++ if (!GTK_ARDOUR::ardourino) {
+ pre_redirect_box.set_sensitive (true);
+ post_redirect_box.set_sensitive (true);
++ }
+ speed_spinner.set_sensitive (true);
+ break;
+ }
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/opts.cc ardour-2.0.3/gtk2_ardour/opts.cc
+--- ardour-2.0.3.orig/gtk2_ardour/opts.cc 2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/opts.cc 2007-07-16 12:33:21.000000000 +0200
+@@ -37,6 +37,7 @@
+ char* GTK_ARDOUR::curvetest_file = 0;
+ bool GTK_ARDOUR::try_hw_optimization = true;
+ string GTK_ARDOUR::keybindings_path = ""; /* empty means use builtin default */
++bool GTK_ARDOUR::ardourino = false;
+
+ using namespace GTK_ARDOUR;
+
+@@ -58,6 +59,7 @@
+ << _(" [session-name] Name of session to load\n")
+ << _(" -C, --curvetest filename Curve algorithm debugger\n")
+ << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour2/ardour.bindings)\n")
++ << _(" -a, --ardourino Fit on screens with 800x600 resolution\n")
+ ;
+ return 1;
+
+@@ -87,6 +89,7 @@
+ { "no-hw-optimizations", 0, 0, 'O' },
+ { "sync", 0, 0, 'O' },
+ { "curvetest", 1, 0, 'C' },
++ { "ardourino", 0, 0, 'a' },
+ { 0, 0, 0, 0 }
+ };
+
+@@ -151,6 +154,10 @@
+ keybindings_path = optarg;
+ break;
+
++ case 'a':
++ ardourino = true;
++ break;
++
+ default:
+ return print_help(execname);
+ }
+diff -Naur -x '*.orig' -x '*.pot' -x ardour-2.0.3 -x '*.bindings' -x '*.sh' -x '*.po' -x '*.mo' -x '*~' -x '*.os' -x '*.o' ardour-2.0.3.orig/gtk2_ardour/opts.h ardour-2.0.3/gtk2_ardour/opts.h
+--- ardour-2.0.3.orig/gtk2_ardour/opts.h 2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/opts.h 2007-07-16 11:25:47.000000000 +0200
+@@ -37,6 +37,7 @@
+ extern bool try_hw_optimization;
+ extern bool use_gtk_theme;
+ extern string keybindings_path;
++extern bool ardourino;
+
+ extern int32_t parse_opts (int argc, char *argv[]);
+
Modified: ardour/trunk/debian/patches/series
===================================================================
--- ardour/trunk/debian/patches/series 2007-07-23 19:31:55 UTC (rev 1515)
+++ ardour/trunk/debian/patches/series 2007-07-25 15:52:17 UTC (rev 1516)
@@ -1,3 +1,4 @@
50-soundtouch.patch
60-libdir.patch
70_DARCH.patch
+80_ardourino.patch
More information about the Demudi-commits
mailing list