[SCM] ardour Debian packaging branch, master, updated. debian/2.8.6-1-21-g0534aee
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Wed May 26 14:27:42 UTC 2010
The following commit has been merged in the master branch:
commit 08e9745f2f3a7c9787d21b91894293a8b3894192
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Wed May 26 15:56:21 2010 +0200
Refresh ardourino patch.
git-buildpackage caused rejects of this patch, though quilt was still
able to apply it.
Let's try a refresh here to compensate for changed line numbers in the
upstream source.
diff --git a/debian/patches/80_ardourino.patch b/debian/patches/80_ardourino.patch
index d8de6fa..64e2565 100644
--- a/debian/patches/80_ardourino.patch
+++ b/debian/patches/80_ardourino.patch
@@ -1,5 +1,3 @@
-diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
-index 7287e6f..2ebd14d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -57,6 +57,7 @@
@@ -10,8 +8,8 @@ index 7287e6f..2ebd14d 100644
#include "i18n.h"
-@@ -211,10 +212,11 @@ MixerStrip::init ()
- group_button.set_name ("MixerGroupButton");
+@@ -213,10 +214,11 @@
+
group_label.set_name ("MixerGroupButtonLabel");
- comment_button.set_name ("MixerCommentButton");
@@ -25,7 +23,7 @@ index 7287e6f..2ebd14d 100644
global_vpacker.set_border_width (0);
global_vpacker.set_spacing (0);
-@@ -242,10 +244,16 @@ MixerStrip::init ()
+@@ -244,10 +246,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);
@@ -45,7 +43,7 @@ index 7287e6f..2ebd14d 100644
global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN);
-@@ -428,7 +436,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
+@@ -435,7 +443,10 @@
/* now force an update of all the various elements */
pre_redirect_box.update();
@@ -57,7 +55,7 @@ index 7287e6f..2ebd14d 100644
mute_changed (0);
solo_changed (0);
name_changed (0);
-@@ -437,7 +448,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
+@@ -444,7 +455,9 @@
connect_to_pan ();
@@ -68,7 +66,7 @@ index 7287e6f..2ebd14d 100644
if (is_audio_track()) {
speed_changed ();
-@@ -479,10 +492,13 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -486,10 +499,13 @@
/* always set the gpm width again, things may be hidden */
gpm.set_width (w);
@@ -85,7 +83,7 @@ index 7287e6f..2ebd14d 100644
_width_owner = owner;
ensure_xml_node ();
-@@ -502,18 +518,21 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -509,18 +525,21 @@
((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
@@ -116,7 +114,7 @@ index 7287e6f..2ebd14d 100644
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
set_size_request (-1, -1);
break;
-@@ -525,18 +544,21 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -532,18 +551,21 @@
((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
@@ -147,9 +145,9 @@ index 7287e6f..2ebd14d 100644
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;
-@@ -818,7 +842,9 @@ MixerStrip::update_output_display ()
- }
-
+@@ -1010,7 +1032,9 @@
+ {
+ update_io_button (_route, _width, false);
gpm.setup_meters ();
- panners.setup_pan ();
+ if (!ARDOUR_COMMAND_LINE::ardourino) {
@@ -158,7 +156,7 @@ index 7287e6f..2ebd14d 100644
}
void
-@@ -1214,13 +1240,17 @@ MixerStrip::map_frozen ()
+@@ -1406,13 +1430,17 @@
if (at) {
switch (at->freeze_state()) {
case AudioTrack::Frozen:
@@ -180,11 +178,9 @@ index 7287e6f..2ebd14d 100644
speed_spinner.set_sensitive (true);
// XXX need some way, maybe, to retoggle redirect editors
break;
-diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
-index 2814f12..28a4d5f 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
-@@ -41,6 +41,7 @@ bool ARDOUR_COMMAND_LINE::try_hw_optimization = true;
+@@ -41,6 +41,7 @@
Glib::ustring ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
Glib::ustring ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
@@ -192,7 +188,7 @@ index 2814f12..28a4d5f 100644
using namespace ARDOUR_COMMAND_LINE;
-@@ -64,6 +65,7 @@ print_help (const char *execname)
+@@ -64,6 +65,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")
@@ -200,7 +196,7 @@ index 2814f12..28a4d5f 100644
;
return 1;
-@@ -99,6 +101,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
+@@ -99,6 +101,7 @@
{ "sync", 0, 0, 'S' },
{ "curvetest", 1, 0, 'C' },
{ "sillyAppleUndocumentedFinderFeature", 1, 0, 'p' },
@@ -208,7 +204,7 @@ index 2814f12..28a4d5f 100644
{ 0, 0, 0, 0 }
};
-@@ -177,6 +180,10 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
+@@ -177,6 +180,10 @@
keybindings_path = optarg;
break;
@@ -219,11 +215,9 @@ index 2814f12..28a4d5f 100644
default:
return print_help(execname);
}
-diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
-index efa2656..d5fbc9b 100644
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
-@@ -36,6 +36,7 @@ extern char* curvetest_file;
+@@ -36,6 +36,7 @@
extern bool try_hw_optimization;
extern bool use_gtk_theme;
extern Glib::ustring keybindings_path;
@@ -231,8 +225,6 @@ index efa2656..d5fbc9b 100644
extern Glib::ustring menus_file;
extern bool finder_invoked_ardour;
-diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
-index e1481a1..e1bb71b 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -53,6 +53,7 @@
@@ -243,7 +235,7 @@ index e1481a1..e1bb71b 100644
#ifdef FREESOUND
#include "sfdb_freesound_mootcher.h"
-@@ -422,7 +423,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
+@@ -426,7 +427,9 @@
chooser.add_filter (custom_filter);
chooser.add_filter (matchall_filter);
chooser.set_select_multiple (true);
@@ -252,9 +244,9 @@ index e1481a1..e1bb71b 100644
+ chooser.signal_update_preview().connect(mem_fun(*this, &SoundFileBrowser::update_preview));
+ }
chooser.signal_file_activated().connect (mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
-
- if (!persistent_folder.empty()) {
-@@ -433,7 +436,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
+ #ifdef GTKOSX
+ /* some broken redraw behaviour - this is a bandaid */
+@@ -441,7 +444,9 @@
hpacker.set_spacing (6);
hpacker.pack_start (notebook, true, true);
@@ -265,7 +257,7 @@ index e1481a1..e1bb71b 100644
get_vbox()->pack_start (hpacker, true, true);
-@@ -569,7 +574,9 @@ void
+@@ -577,7 +582,9 @@
SoundFileBrowser::set_session (Session* s)
{
ArdourDialog::set_session (s);
@@ -276,7 +268,7 @@ index e1481a1..e1bb71b 100644
if (s) {
add_gain_meter ();
} else {
-@@ -634,6 +641,9 @@ SoundFileBrowser::on_custom (const FileFilter::Info& filter_info)
+@@ -642,6 +649,9 @@
void
SoundFileBrowser::update_preview ()
{
@@ -286,7 +278,7 @@ index e1481a1..e1bb71b 100644
if (preview.setup_labels (chooser.get_filename())) {
if (preview.autoplay()) {
Glib::signal_idle().connect (mem_fun (preview, &SoundFileBox::audition_oneshot));
-@@ -660,7 +670,9 @@ SoundFileBrowser::found_list_view_selected ()
+@@ -668,7 +678,9 @@
set_response_sensitive (RESPONSE_OK, false);
}
@@ -297,7 +289,7 @@ index e1481a1..e1bb71b 100644
}
}
-@@ -683,7 +695,9 @@ SoundFileBrowser::freesound_list_view_selected ()
+@@ -691,7 +703,9 @@
set_response_sensitive (RESPONSE_OK, false);
}
@@ -308,7 +300,7 @@ index e1481a1..e1bb71b 100644
}
}
-@@ -1240,29 +1254,30 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
+@@ -1248,29 +1262,30 @@
channel_combo.set_active_text (str.front());
channel_combo.set_sensitive (false);
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list