[SCM] Audacity debian packaging branch, master, updated. debian/1.3.11-2-5-g8d35a1e
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Thu Apr 1 01:16:14 UTC 2010
The following commit has been merged in the master branch:
commit f08fc96dd2a279908c5ca7ba9ac139794e33881a
Author: Benjamin Drung <bdrung at gmail.com>
Date: Thu Apr 1 02:04:19 2010 +0200
Remove all patches (they are applied upstream).
diff --git a/debian/patches/disk-full-on-export.patch b/debian/patches/disk-full-on-export.patch
deleted file mode 100644
index 0e69992..0000000
--- a/debian/patches/disk-full-on-export.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: No error message is given when disk gets full on PCM export
- Please also have a look at the error message on sf_close and see that it
- actually works.
-Bug-Ubuntu: https://launchpad.net/bugs/259798
-Forwarded: yes
-Author: David Henningsson <launchpad.web at epost.diwic.se>
-diff -Nur -x '*.orig' -x '*~' audacity-1.3.9/src/export/ExportPCM.cpp audacity-1.3.9.new/src/export/ExportPCM.cpp
---- audacity-1.3.9/src/export/ExportPCM.cpp 2009-10-11 10:24:55.418303300 +0200
-+++ audacity-1.3.9.new/src/export/ExportPCM.cpp 2009-10-11 10:28:05.589104320 +0200
-@@ -529,6 +529,7 @@
- formatStr.c_str()));
-
- while(updateResult == eProgressSuccess) {
-+ sampleCount samplesWritten;
- sampleCount numSamples = mixer->Process(maxBlockLen);
-
- if (numSamples == 0)
-@@ -538,11 +539,20 @@
-
- ODManager::LockLibSndFileMutex();
- if (format == int16Sample)
-- sf_writef_short(sf, (short *)mixed, numSamples);
-+ samplesWritten = sf_writef_short(sf, (short *)mixed, numSamples);
- else
-- sf_writef_float(sf, (float *)mixed, numSamples);
-+ samplesWritten = sf_writef_float(sf, (float *)mixed, numSamples);
- ODManager::UnlockLibSndFileMutex();
-
-+ if (samplesWritten != numSamples) {
-+ char buffer2[1000];
-+ sf_error_str(sf, buffer2, 1000);
-+ /* Tried the format %s variant (like below) but got garbage, probably it depends on
-+ Audacity and/or libsndfile being compiled with unicode or not */
-+ wxMessageBox(_("Error while writing file (disk full?): ") + wxString::FromAscii(buffer2));
-+ break;
-+ }
-+
- updateResult = progress->Update(mixer->MixGetCurrentTime()-t0, t1-t0);
- }
-
diff --git a/debian/patches/export-multiple.patch b/debian/patches/export-multiple.patch
deleted file mode 100644
index 129ef45..0000000
--- a/debian/patches/export-multiple.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Description: Add "Consecutively numbered Label/Track Name" option
-Bug-Ubuntu: https://launchpad.net/bugs/276043
-Forwarded: yes
-Author: Benjamin Drung <bdrung at ubuntu.com>
-
---- audacity-1.3.11.orig/src/export/ExportMultiple.cpp
-+++ audacity-1.3.11/src/export/ExportMultiple.cpp
-@@ -65,6 +65,7 @@ enum {
- TrackID,
- ByNameID,
- ByNumberID,
-+ ByNameAndNumberID,
- PrefixID,
- OverwriteID
- };
-@@ -307,13 +308,21 @@ void ExportMultiple::PopulateOrExchange(
- {
- // Row 1
- S.SetBorder(1);
-- mByName = S.Id(ByNameID)
-+ mByNumberAndName = S.Id(ByNameAndNumberID)
- .AddRadioButton(wxT(""));
-+ mByNumberAndName->SetName(_("Consecutively numbered Label/Track Name"));
-+ S.SetBorder(3);
-+ mByNumberAndNameLabel = S.AddVariableText(_("Consecutively numbered Label/Track Name"), false);
-+
-+ // Row 2
-+ S.SetBorder(1);
-+ mByName = S.Id(ByNameID)
-+ .AddRadioButtonToGroup(wxT(""));
- mByName->SetName(_("Using Label/Track Name"));
- S.SetBorder(3);
- mByNameLabel = S.AddVariableText(_("Using Label/Track Name"), false);
-
-- // Row 2
-+ // Row 3
- S.SetBorder(1);
- mByNumber = S.Id(ByNumberID)
- .AddRadioButtonToGroup(wxT(""));
-@@ -321,7 +330,7 @@ void ExportMultiple::PopulateOrExchange(
- S.SetBorder(3);
- mByNumberLabel = S.AddVariableText(_("Numbering consecutively"), false);
-
-- // Row 3
-+ // Row 4
- S.AddVariableText(wxT(""), false);
- S.StartHorizontalLay(wxEXPAND, false);
- {
-@@ -365,7 +374,7 @@ void ExportMultiple::EnableControls()
- mFirst->Enable(mLabel->GetValue());
-
- enable = mLabel->GetValue() &&
-- mByName->GetValue() &&
-+ (mByName->GetValue() || mByNumberAndName->GetValue()) &&
- mFirst->GetValue();
- mFirstFileLabel->Enable(enable);
- mFirstFileName->Enable(enable);
-@@ -518,12 +527,14 @@ void ExportMultiple::OnExport(wxCommandE
- mExported.Empty();
-
- if (mLabel->GetValue()) {
-- ok = ExportMultipleByLabel(mByName->GetValue(),
-- mPrefix->GetValue());
-+ ok = ExportMultipleByLabel(mByName->GetValue() || mByNumberAndName->GetValue(),
-+ mPrefix->GetValue(),
-+ mByNumberAndName->GetValue());
- }
- else {
-- ok = ExportMultipleByTrack(mByName->GetValue(),
-- mPrefix->GetValue());
-+ ok = ExportMultipleByTrack(mByName->GetValue() || mByNumberAndName->GetValue(),
-+ mPrefix->GetValue(),
-+ mByNumberAndName->GetValue());
- }
-
- // Give 'em the result
-@@ -602,7 +613,7 @@ bool ExportMultiple::DirOk()
- return fn.Mkdir(0777, wxPATH_MKDIR_FULL);
- }
-
--int ExportMultiple::ExportMultipleByLabel(bool byName, wxString prefix)
-+int ExportMultiple::ExportMultipleByLabel(bool byName, wxString prefix, bool addNumber)
- {
- wxASSERT(mProject);
- bool tagsPrompt = mProject->GetShowId3Dialog();
-@@ -669,9 +680,14 @@ int ExportMultiple::ExportMultipleByLabe
- name.Printf(wxT("%s-%02d"), prefix.c_str(), l+1);
- else
- name.Printf(wxT("%s-%d"), prefix.c_str(), l+1);
-+ } else if (addNumber) {
-+ if (numFiles > 9)
-+ name.Prepend(wxString::Format(wxT("%02d "), l+1));
-+ else
-+ name.Prepend(wxString::Format(wxT("%d "), l+1));
- }
-
-- // store sanitised and user checjed name in object
-+ // store sanitised and user checked name in object
- setting.destfile.SetName(MakeFileName(name));
-
- wxASSERT(setting.destfile.IsOk()); // scream if file name is broke
-@@ -715,7 +731,8 @@ int ExportMultiple::ExportMultipleByLabe
- }
-
- int ExportMultiple::ExportMultipleByTrack(bool byName,
-- wxString prefix)
-+ wxString prefix,
-+ bool addNumber)
- {
- wxASSERT(mProject);
- bool tagsPrompt = mProject->GetShowId3Dialog();
-@@ -793,6 +810,13 @@ int ExportMultiple::ExportMultipleByTrac
- title = tr->GetName();
- if (byName) {
- name = title;
-+ if (addNumber) {
-+ if (numTracks > 9) {
-+ name.Prepend(wxString::Format(wxT("%02d "), l+1));
-+ } else {
-+ name.Prepend(wxString::Format(wxT("%d "), l+1));
-+ }
-+ }
- }
- else {
- if (numTracks > 9) {
---- audacity-1.3.11.orig/src/export/ExportMultiple.h
-+++ audacity-1.3.11/src/export/ExportMultiple.h
-@@ -52,7 +52,7 @@ private:
- * labels that define them (true), or just numbered (false).
- * @param prefix The string used to prefix the file number if files are being
- * numbered rather than named */
-- int ExportMultipleByLabel(bool byName, wxString prefix);
-+ int ExportMultipleByLabel(bool byName, wxString prefix, bool addNumber);
-
- /** \brief Export each track in the project to a separate file
- *
-@@ -60,7 +60,7 @@ private:
- * (true), or just numbered (false).
- * @param prefix The string used to prefix the file number if files are being
- * numbered rather than named */
-- int ExportMultipleByTrack(bool byName, wxString prefix);
-+ int ExportMultipleByTrack(bool byName, wxString prefix, bool addNumber);
-
- /** Export one file of an export multiple set
- *
-@@ -155,6 +155,9 @@ private:
- wxRadioButton *mByNumber; /**< button to choose numbering exported files */
- wxStaticText *mByNumberLabel;
-
-+ wxRadioButton *mByNumberAndName;
-+ wxStaticText *mByNumberAndNameLabel;
-+
- wxStaticText *mPrefixLabel;
- wxTextCtrl *mPrefix;
-
diff --git a/debian/patches/lang.patch b/debian/patches/lang.patch
deleted file mode 100644
index 4fe5f11..0000000
--- a/debian/patches/lang.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: respect locales/$LANG
-Bug-Debian: http://bugs.debian.org/481424
-Bug-Ubuntu: https://launchpad.net/bugs/292168
-Forwarded: yes
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Accepted-upstream: http://code.google.com/p/audacity/source/detail?r=10067
-
-diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
-index 21be5ac..de36ecc 100644
---- a/src/AudacityApp.cpp
-+++ b/src/AudacityApp.cpp
-@@ -70,6 +70,7 @@ It handles initialization and termination by subclassing wxApp.
- #include "GStreamerLoader.h"
- #include "Internat.h"
- #include "LangChoice.h"
-+#include "Languages.h"
- #include "Prefs.h"
- #include "Project.h"
- #include "Screenshot.h"
-@@ -1024,9 +1025,8 @@ bool AudacityApp::OnInit()
-
- wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
-
-- // Pop up a dialog the first time the program is run
- if (lang == wxT(""))
-- lang = ChooseLanguage(NULL);
-+ lang = GetSystemLanguageCode();
-
- #ifdef NOT_RQD
- //TIDY-ME: (CleanSpeech) Language prompt??
-@@ -1038,7 +1038,6 @@ bool AudacityApp::OnInit()
- //lda if (lang == "")
- //lda lang = ChooseLanguage(NULL);
- #endif
-- gPrefs->Write(wxT("/Locale/Language"), lang);
-
- mLocale = NULL;
- InitLang( lang );
-diff --git a/src/Languages.cpp b/src/Languages.cpp
-index 061beb6..c625243 100644
---- a/src/Languages.cpp
-+++ b/src/Languages.cpp
-@@ -223,6 +223,10 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
-
- tempNames.Sort();
-
-+ // Add system language
-+ langNames.Add(wxT("System"));
-+ langCodes.Add(wxT(""));
-+
- for(j=0; j<tempNames.GetCount(); j++) {
- langNames.Add(tempNames[j]);
- langCodes.Add(reverseHash[tempNames[j]]);
-diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp
-index ce63d66..7728baf 100644
---- a/src/prefs/EffectsPrefs.cpp
-+++ b/src/prefs/EffectsPrefs.cpp
-@@ -126,6 +126,8 @@ bool EffectsPrefs::Apply()
-
- // If language has changed, we want to change it now, not on the next reboot.
- wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
-+ if (lang == wxT(""))
-+ lang = GetSystemLanguageCode();
- wxGetApp().InitLang(lang);
-
- return true;
-diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
-index 5971088..a6539c1 100644
---- a/src/prefs/GUIPrefs.cpp
-+++ b/src/prefs/GUIPrefs.cpp
-@@ -113,7 +113,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
-
- S.TieChoice(_("&Language:"),
- wxT("/Locale/Language"),
-- wxT("en"),
-+ wxT(""),
- mLangNames,
- mLangCodes);
- S.SetSizeHints(mLangNames);
-@@ -161,6 +161,8 @@ bool GUIPrefs::Apply()
-
- // If language has changed, we want to change it now, not on the next reboot.
- wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
-+ if (lang == wxT(""))
-+ lang = GetSystemLanguageCode();
- wxGetApp().InitLang(lang);
-
- return true;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f45722c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-disk-full-on-export.patch
-export-multiple.patch
-lang.patch
-switch-hostapi-crash.patch
diff --git a/debian/patches/switch-hostapi-crash.patch b/debian/patches/switch-hostapi-crash.patch
deleted file mode 100644
index 64b7575..0000000
--- a/debian/patches/switch-hostapi-crash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Protect against Pa_GetDeviceInfo returning null sometimes.
- Please see https://launchpad.net/bugs/436990 for thoughts about the underlying
- issue.
-Bug-Ubuntu: https://launchpad.net/bugs/436990
-Forwarded: yes
-Author: David Henningsson <launchpad.web at epost.diwic.se>
-Accepted-upstream: http://code.google.com/p/audacity/source/detail?r=10066
-
-diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
---- a/src/prefs/DevicePrefs.cpp
-+++ b/src/prefs/DevicePrefs.cpp
-@@ -334,6 +334,10 @@ wxString DevicePrefs::GetDefaultPlayDevice(int index)
- wxLogDebug(wxT("GetDefaultPlayDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str());
- wxLogDebug(wxT("GetDefaultPlayDevice() default output %d"), apiinfo->defaultOutputDevice);
- const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultOutputDevice);
-+ if (devinfo == NULL) {
-+ wxLogDebug(wxT("GetDefaultPlayDevice() no default output device"));
-+ return wxString("", wxConvLocal);
-+ }
- wxString name(devinfo->name, wxConvLocal);
- wxLogDebug(wxT("GetDefaultPlayDevice() default output device name %s"), name.c_str());
- return name;
-@@ -349,6 +353,10 @@ wxString DevicePrefs::GetDefaultRecordDevice(int index)
- wxLogDebug(wxT("GetDefaultRecordDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str());
- wxLogDebug(wxT("GetDefaultRecordDevice() default input %d"), apiinfo->defaultInputDevice);
- const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultInputDevice);
-+ if (devinfo == NULL) {
-+ wxLogDebug(wxT("GetDefaultRecordDevice() no default input device"));
-+ return wxString("", wxConvLocal);
-+ }
- wxString name(devinfo->name, wxConvLocal);
- wxLogDebug(wxT("GetDefaultRecordDevice() default input device name %s"), name.c_str());
- return name;
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list