[Demudi-commits] r1520 - in ardour/trunk/debian: . patches
free-guest at alioth.debian.org
free-guest at alioth.debian.org
Tue Jul 31 22:17:11 UTC 2007
Author: free-guest
Date: 2007-07-31 22:17:10 +0000 (Tue, 31 Jul 2007)
New Revision: 1520
Added:
ardour/trunk/debian/ardourino.template
Modified:
ardour/trunk/debian/ardour.install
ardour/trunk/debian/changelog
ardour/trunk/debian/patches/80_ardourino.patch
Log:
* Include pre-redirect in ardourino
* Added ardourino template
Modified: ardour/trunk/debian/ardour.install
===================================================================
--- ardour/trunk/debian/ardour.install 2007-07-26 18:45:27 UTC (rev 1519)
+++ ardour/trunk/debian/ardour.install 2007-07-31 22:17:10 UTC (rev 1520)
@@ -5,3 +5,4 @@
debian/tmp/generic/etc/ardour2* etc/
debian/ardour.desktop usr/share/applications
debian/ardour2-session_exchange.py usr/bin
+debian/ardourino.template usr/share/ardour2/templates/
Added: ardour/trunk/debian/ardourino.template
===================================================================
--- ardour/trunk/debian/ardourino.template (rev 0)
+++ ardour/trunk/debian/ardourino.template 2007-07-31 22:17:10 UTC (rev 1520)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Session version="2.0.0" id-counter="56">
+ <Config>
+ <Option name="output-auto-connect" value="2"/>
+ <Option name="input-auto-connect" value="1"/>
+ <Option name="meter-falloff" value="32"/>
+ <end-marker-is-free val="yes"/>
+ </Config>
+ <Sources/>
+ <Regions/>
+ <DiskStreams/>
+ <Locations>
+ <Location id="57" name="start" start="0" end="0" flags="IsMark,IsStart"/>
+ <Location id="58" name="end" start="13230000" end="13230000" flags="IsMark,IsEnd"/>
+ </Locations>
+ <Connections/>
+ <Routes>
+ <Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
+ <IO name="master" id="18" inputs="{}{}" outputs="{alsa_pcm:playback_1}{alsa_pcm:playback_2}" gain="1.000000000000" iolimits="-1,2,-1,2">
+ <Panner linked="no" link_direction="SameDirection" bypassed="no">
+ <Output x="0" y="0"/>
+ <Output x="1" y="0"/>
+ <StreamPanner x="0" type="Equal Power Stereo" muted="no">
+ <Automation>
+ <AutomationList id="47" default="0" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+ </Automation>
+ <controllable name="panner" id="46"/>
+ </StreamPanner>
+ <StreamPanner x="1" type="Equal Power Stereo" muted="no">
+ <Automation>
+ <AutomationList id="50" default="1" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+ </Automation>
+ <controllable name="panner" id="49"/>
+ </StreamPanner>
+ </Panner>
+ <controllable name="gaincontrol" id="19"/>
+ </IO>
+ <controllable name="solo" id="22"/>
+ <controllable name="mute" id="23"/>
+ <remote_control id="1"/>
+ <extra>
+ <GUI color="22846:21313:45729" shown_editor="yes" track_height="normal" shown_mixer="yes">
+ <gain track_height="normal" shown="no"/>
+ <pan track_height="normal" shown="no"/>
+ </GUI>
+ </extra>
+ </Route>
+ </Routes>
+ <EditGroups/>
+ <MixGroups/>
+ <Playlists/>
+ <UnusedPlaylists/>
+ <Click>
+ <IO name="click" id="24" inputs="" outputs="{alsa_pcm:playback_1}" gain="1.000000000000" iolimits="0,0,-1,-1">
+ <Panner linked="no" link_direction="SameDirection" bypassed="no"/>
+ <controllable name="gaincontrol" id="25"/>
+ </IO>
+ </Click>
+ <TempoMap>
+ <Tempo start="1|1|0" beats-per-minute="120.000000" movable="no"/>
+ <Meter start="1|1|0" note-type="4.000000" beats-per-bar="4.000000" movable="no"/>
+ </TempoMap>
+ <ControlProtocols>
+ <Protocol name="Generic MIDI" active="no"/>
+ <Protocol name="Mackie" active="no"/>
+ </ControlProtocols>
+ <extra>
+ <RulerVisibility smpte="no" bbt="no" frames="no" minsec="no" tempo="no" meter="no" marker="no" rangemarker="no" transportmarker="yes"/>
+ </extra>
+</Session>
Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog 2007-07-26 18:45:27 UTC (rev 1519)
+++ ardour/trunk/debian/changelog 2007-07-31 22:17:10 UTC (rev 1520)
@@ -1,3 +1,10 @@
+ardour (1:2.0.3-3) unstable; urgency=low
+
+ * Include pre-redirect in ardourino
+ * Added ardourino template
+
+ -- Free Ekanayaka <freee at debian.org> Sat, 28 Jul 2007 12:48:58 +0200
+
ardour (1:2.0.3-2) unstable; urgency=low
* Added "ardourino" patch, for displays with 800x600 resolutions
Modified: ardour/trunk/debian/patches/80_ardourino.patch
===================================================================
--- ardour/trunk/debian/patches/80_ardourino.patch 2007-07-26 18:45:27 UTC (rev 1519)
+++ ardour/trunk/debian/patches/80_ardourino.patch 2007-07-31 22:17:10 UTC (rev 1520)
@@ -1,6 +1,6 @@
-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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/ardour_ui2.cc 2007-07-25 17:53:30.000000000 +0200
@@ -98,7 +98,9 @@
shuttle_fract = 0;
shuttle_box.queue_draw ();
@@ -184,9 +184,9 @@
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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/ardour_ui.cc 2007-07-25 17:53:30.000000000 +0200
@@ -147,7 +147,9 @@
auditioning_alert_button (_("AUDITION")),
@@ -278,9 +278,9 @@
}
}
-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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_dialogs.cc 2007-07-25 17:53:30.000000000 +0200
@@ -110,8 +110,10 @@
setup_session_options ();
@@ -321,9 +321,9 @@
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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_ed.cc 2007-07-25 17:53:30.000000000 +0200
@@ -316,7 +316,9 @@
ActionManager::transport_sensitive_actions.push_back (act);
@@ -411,9 +411,9 @@
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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/ardour_ui.h 2007-07-25 17:53:30.000000000 +0200
@@ -404,6 +404,7 @@
void sync_option_changed ();
@@ -430,10 +430,21 @@
};
#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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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 @@
++++ ardour-2.0.3/gtk2_ardour/ardour_ui_options.cc 2007-07-27 13:40:44.000000000 +0200
+@@ -42,7 +42,9 @@
+ void
+ ARDOUR_UI::toggle_time_master ()
+ {
+- ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master, &Configuration::get_jack_time_master);
++ if (!ardourino) {
++ ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master, &Configuration::get_jack_time_master);
++ }
+ }
+
+ void
+@@ -501,7 +503,9 @@
}
positional_sync_strings.push_back (slave_source_to_string (JACK));
@@ -444,7 +455,7 @@
}
void
-@@ -965,7 +967,9 @@
+@@ -965,7 +969,9 @@
} else if (PARAM_IS ("clicking")) {
ActionManager::map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
} else if (PARAM_IS ("jack-time-master")) {
@@ -455,9 +466,9 @@
} 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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/editor.cc 2007-07-28 12:35:18.000000000 +0200
@@ -74,6 +74,7 @@
#include "canvas_impl.h"
#include "actions.h"
@@ -546,23 +557,38 @@
/* Pack everything in... */
-@@ -2640,9 +2643,11 @@
- toolbar_hbox.pack_start (*tools_tearoff, false, false);
+@@ -2637,21 +2640,22 @@
+ toolbar_hbox.set_border_width (1);
+ toolbar_hbox.pack_start (*mouse_mode_tearoff, false, false);
+- toolbar_hbox.pack_start (*tools_tearoff, false, false);
+-
- hbox->pack_start (snap_box, false, false);
+ if (!ardourino) {
++ toolbar_hbox.pack_start (*tools_tearoff, false, false);
+ 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 ();
+ }
- 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
+- hbox->show_all ();
+-
+ toolbar_base.set_name ("ToolBarBase");
+ toolbar_base.add (toolbar_hbox);
+
+ toolbar_frame.set_shadow_type (SHADOW_OUT);
+ toolbar_frame.set_name ("BaseFrame");
+ toolbar_frame.add (toolbar_base);
++
+ }
+
+ int
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/editor.h 2007-07-25 17:53:30.000000000 +0200
@@ -1851,6 +1851,7 @@
Glib::RefPtr<Gtk::Action> redo_action;
@@ -571,9 +597,41 @@
};
#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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/export_dialog.cc ardour-2.0.3/gtk2_ardour/export_dialog.cc
+--- ardour-2.0.3.orig/gtk2_ardour/export_dialog.cc 2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/export_dialog.cc 2007-07-27 15:55:39.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include "ardour_ui.h"
+ #include "public_editor.h"
+ #include "keyboard.h"
++#include "opts.h"
+
+ #include "i18n.h"
+
+@@ -1106,8 +1107,18 @@
+ TreeModel::iterator iter = master_list->append();
+ TreeModel::Row row = *iter;
+ row[exp_cols.output] = name;
+- row[exp_cols.left] = false;
+- row[exp_cols.right] = false;
++ if (GTK_ARDOUR::ardourino) {
++ if (i % 2) {
++ row[exp_cols.left] = false;
++ row[exp_cols.right] = true;
++ } else {
++ row[exp_cols.left] = true;
++ row[exp_cols.right] = false;
++ }
++ } else {
++ row[exp_cols.left] = false;
++ row[exp_cols.right] = false;
++ }
+ row[exp_cols.port] = route->output (i);
+ } else {
+ TreeModel::iterator iter = track_list->append();
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/mixer_strip.cc 2007-07-27 13:17:45.000000000 +0200
@@ -56,6 +56,7 @@
#include "io_selector.h"
#include "utils.h"
@@ -582,73 +640,210 @@
#include "i18n.h"
-@@ -252,11 +253,15 @@
+@@ -221,14 +222,16 @@
+ group_button.set_name ("MixerGroupButton");
+ group_label.set_name ("MixerGroupButtonLabel");
- 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);
+- comment_button.set_name ("MixerCommentButton");
+ if (!GTK_ARDOUR::ardourino) {
-+ global_vpacker.pack_start (pre_redirect_box, true, true);
++ comment_button.set_name ("MixerCommentButton");
+
+- ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment()=="" ?
++ ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment()=="" ?
+ _("Click to Add/Edit Comments"):
+ _route->comment());
+
+- comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
+-
++ comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
+ }
++
+ global_vpacker.set_border_width (0);
+ global_vpacker.set_spacing (0);
+
+@@ -256,10 +259,16 @@
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);
+- global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+ if (!GTK_ARDOUR::ardourino) {
+ global_vpacker.pack_start (post_redirect_box, true, true);
+ }
- global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
++ if (!GTK_ARDOUR::ardourino) {
++ 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 @@
+- global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
++ if (!GTK_ARDOUR::ardourino) {
++ global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
++ }
+ if (route()->master() || route()->control()) {
+
+@@ -330,7 +339,10 @@
/* now force an update of all the various elements */
-- pre_redirect_box.update();
+ 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 @@
+@@ -339,7 +351,9 @@
+ connect_to_pan ();
+
+- panners.setup_pan ();
++ if (!GTK_ARDOUR::ardourino) {
++ panners.setup_pan ();
++ }
+
+ if (is_audio_track()) {
+ speed_changed ();
+@@ -396,10 +410,13 @@
+ /* always set the gpm width again, things may be hidden */
+
gpm.set_width (w);
- panners.set_width (w);
-- pre_redirect_box.set_width (w);
+- panners.set_width (w);
++ if (!GTK_ARDOUR::ardourino) {
++ 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 @@
+@@ -424,18 +441,21 @@
+ ((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
+ ((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
+
+- if (_route->comment() == "") {
+- comment_button.unset_bg (STATE_NORMAL);
+- ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
+- } else {
+- comment_button.modify_bg (STATE_NORMAL, color());
+- ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
++ if (!GTK_ARDOUR::ardourino) {
++ if (_route->comment() == "") {
++ comment_button.unset_bg (STATE_NORMAL);
++ ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
++ } else {
++ comment_button.modify_bg (STATE_NORMAL, color());
++ ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
++ }
+ }
+-
+ ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
+ ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state()));
+- ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
+- ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
++ if (!GTK_ARDOUR::ardourino) {
++ ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
++ ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
++ }
+ Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
+ break;
+
+@@ -446,18 +466,21 @@
+ ((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
+ ((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
+
+- if (_route->comment() == "") {
+- comment_button.unset_bg (STATE_NORMAL);
+- ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
+- } else {
+- comment_button.modify_bg (STATE_NORMAL, color());
+- ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
++ if (!GTK_ARDOUR::ardourino) {
++ if (_route->comment() == "") {
++ comment_button.unset_bg (STATE_NORMAL);
++ ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
++ } else {
++ comment_button.modify_bg (STATE_NORMAL, color());
++ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
++ }
+ }
+-
+ ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
+ ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
+- ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
+- ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
++ if (!GTK_ARDOUR::ardourino) {
++ ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
++ ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
++ }
+ Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+ set_size_request (max (50, gpm.get_gm_width()), -1);
+ break;
+@@ -720,7 +743,9 @@
+ break;
+ }
+ }
+- panners.setup_pan ();
++ if (!GTK_ARDOUR::ardourino) {
++ panners.setup_pan ();
++ }
+ }
+
+ void
+@@ -741,7 +766,9 @@
+ }
+ }
+ gpm.setup_meters ();
+- panners.setup_pan ();
++ if (!GTK_ARDOUR::ardourino) {
++ panners.setup_pan ();
++ }
+ }
+
+ void
+@@ -1135,13 +1162,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);
-+ }
+- pre_redirect_box.set_sensitive (false);
+- post_redirect_box.set_sensitive (false);
++ pre_redirect_box.set_sensitive (false);
++ if (!GTK_ARDOUR::ardourino) {
++ 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);
-+ }
+- pre_redirect_box.set_sensitive (true);
+- post_redirect_box.set_sensitive (true);
++ pre_redirect_box.set_sensitive (true);
++ if (!GTK_ARDOUR::ardourino) {
++ 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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/new_session_dialog.cc ardour-2.0.3/gtk2_ardour/new_session_dialog.cc
+--- ardour-2.0.3.orig/gtk2_ardour/new_session_dialog.cc 2007-05-16 04:42:43.000000000 +0200
++++ ardour-2.0.3/gtk2_ardour/new_session_dialog.cc 2007-07-28 11:53:26.000000000 +0200
+@@ -74,6 +74,10 @@
+ m_folder = Gtk::manage(new class Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+ session_template_label = Gtk::manage(new class Gtk::Label(_("Template :")));
+ m_template = Gtk::manage(new class Gtk::FileChooserButton());
++ if (GTK_ARDOUR::ardourino) {
++ m_template->set_filename("/usr/share/ardour2/templates/ardourino.template");
++ }
++
+ m_create_control_bus = Gtk::manage(new class Gtk::CheckButton(_("Create Monitor Bus")));
+
+ Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new class Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/opts.cc 2007-07-25 17:53:30.000000000 +0200
@@ -37,6 +37,7 @@
char* GTK_ARDOUR::curvetest_file = 0;
bool GTK_ARDOUR::try_hw_optimization = true;
@@ -684,9 +879,9 @@
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
+diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur 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
++++ ardour-2.0.3/gtk2_ardour/opts.h 2007-07-25 17:53:30.000000000 +0200
@@ -37,6 +37,7 @@
extern bool try_hw_optimization;
extern bool use_gtk_theme;
More information about the Demudi-commits
mailing list