[SCM] ardour/master: Refreshed patch

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 53f6ecb81c45f6ffd67599e128f4fabcba3bd31d
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Oct 18 11:26:43 2016 +0200

    Refreshed patch

diff --git a/debian/patches/0070-spelling.patch b/debian/patches/0070-spelling.patch
index a195bd8..58df1f5 100644
--- a/debian/patches/0070-spelling.patch
+++ b/debian/patches/0070-spelling.patch
@@ -3,11 +3,9 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: Paul Davis <paul at linuxaudiosystems.com>
 Applied-Upstream: https://github.com/Ardour/ardour/commit/69cbcb84a66cfc48d734692ae0f2f8d8bee4f5b5
 Last-Updated: 2016-10-17
-Index: ardour/libs/backends/alsa/zita-alsa-pcmi.cc
-===================================================================
 --- ardour.orig/libs/backends/alsa/zita-alsa-pcmi.cc
 +++ ardour/libs/backends/alsa/zita-alsa-pcmi.cc
-@@ -735,7 +735,7 @@ int Alsa_pcmi::set_hwpar (snd_pcm_t *han
+@@ -735,7 +735,7 @@
  	snd_pcm_hw_params_get_channels_max (hwpar, nchan);
  	if (*nchan > 1024)
  	{
@@ -16,11 +14,9 @@ Index: ardour/libs/backends/alsa/zita-alsa-pcmi.cc
  				sname);
  		*nchan = 2;
  	}
-Index: ardour/libs/ardour/audio_backend.cc
-===================================================================
 --- ardour.orig/libs/ardour/audio_backend.cc
 +++ ardour/libs/ardour/audio_backend.cc
-@@ -80,7 +80,7 @@ AudioBackend::get_error_string (ErrorCod
+@@ -80,7 +80,7 @@
  	case OutputChannelCountNotSupportedError:
  		return _("Output channel count configuration not supported");
  	case AquireRealtimePermissionError:
@@ -29,11 +25,9 @@ Index: ardour/libs/ardour/audio_backend.cc
  	case SettingAudioThreadPriorityError:
  		return _("Setting audio device thread priorities failed");
  	case SettingMIDIThreadPriorityError:
-Index: ardour/libs/ardour/file_source.cc
-===================================================================
 --- ardour.orig/libs/ardour/file_source.cc
 +++ ardour/libs/ardour/file_source.cc
-@@ -431,7 +431,7 @@ FileSource::find_2X (Session& s, DataTyp
+@@ -433,7 +433,7 @@
  		if (cnt > 1) {
  
  			error << string_compose (
@@ -42,11 +36,9 @@ Index: ardour/libs/ardour/file_source.cc
  			goto out;
  
  		} else if (cnt == 0) {
-Index: ardour/libs/audiographer/src/general/sr_converter.cc
-===================================================================
 --- ardour.orig/libs/audiographer/src/general/sr_converter.cc
 +++ ardour/libs/audiographer/src/general/sr_converter.cc
-@@ -192,7 +192,7 @@ SampleRateConverter::process (ProcessCon
+@@ -192,7 +192,7 @@
  
  		if (throw_level (ThrowProcess) && src_data.output_frames_gen == 0 && leftover_frames) {
  			throw Exception (*this, boost::str (boost::format

-- 
ardour Debian packaging