[SCM] ardour/master: Refreshed 80_ardourino.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e700573a2e90d67a48214c6389f0ffa7d741fb34
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 4 01:32:32 2011 +0200

    Refreshed 80_ardourino.patch

diff --git a/debian/patches/80_ardourino.patch b/debian/patches/80_ardourino.patch
index 637a772..73cb22b 100644
--- a/debian/patches/80_ardourino.patch
+++ b/debian/patches/80_ardourino.patch
@@ -1,5 +1,7 @@
---- a/gtk2_ardour/mixer_strip.cc
-+++ b/gtk2_ardour/mixer_strip.cc
+Index: ardour/gtk2_ardour/mixer_strip.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/mixer_strip.cc	2011-10-04 00:17:40.604134219 +0200
++++ ardour/gtk2_ardour/mixer_strip.cc	2011-10-04 00:22:56.426947262 +0200
 @@ -57,6 +57,7 @@
  #include "io_selector.h"
  #include "utils.h"
@@ -178,11 +180,13 @@
  			speed_spinner.set_sensitive (true);
  			// XXX need some way, maybe, to retoggle redirect editors
  			break;
---- a/gtk2_ardour/opts.cc
-+++ b/gtk2_ardour/opts.cc
+Index: ardour/gtk2_ardour/opts.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/opts.cc	2011-10-04 00:17:40.608134102 +0200
++++ ardour/gtk2_ardour/opts.cc	2011-10-04 00:22:56.426947262 +0200
 @@ -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";
+ std::string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
+ std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
  bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
 +bool ARDOUR_COMMAND_LINE::ardourino = false;
  
@@ -215,18 +219,22 @@
  		default:
  			return print_help(execname);
  		}
---- a/gtk2_ardour/opts.h
-+++ b/gtk2_ardour/opts.h
-@@ -36,6 +36,7 @@
+Index: ardour/gtk2_ardour/opts.h
+===================================================================
+--- ardour.orig/gtk2_ardour/opts.h	2011-10-04 00:17:40.608134102 +0200
++++ ardour/gtk2_ardour/opts.h	2011-10-04 00:33:28.248568229 +0200
+@@ -35,6 +35,7 @@
  extern bool   try_hw_optimization;
  extern bool   use_gtk_theme;
- extern Glib::ustring keybindings_path;
+ extern std::string keybindings_path;
 +extern bool   ardourino;
- extern Glib::ustring menus_file;
+ extern std::string menus_file;
  extern bool   finder_invoked_ardour;
  
---- a/gtk2_ardour/sfdb_ui.cc
-+++ b/gtk2_ardour/sfdb_ui.cc
+Index: ardour/gtk2_ardour/sfdb_ui.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/sfdb_ui.cc	2011-10-04 00:17:40.648132939 +0200
++++ ardour/gtk2_ardour/sfdb_ui.cc	2011-10-04 00:22:56.430947145 +0200
 @@ -53,6 +53,7 @@
  #include "editing.h"
  #include "utils.h"

-- 
ardour Debian packaging