[SCM] dvdstyler/master: Refresh drop-mplex.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7141951fdaf38a3fdc3cea9e0dde843074fe72a7
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 01:32:33 2012 +0100

    Refresh drop-mplex.patch

diff --git a/debian/patches/drop-mplex.patch b/debian/patches/drop-mplex.patch
index 246be09..ec5c065 100644
--- a/debian/patches/drop-mplex.patch
+++ b/debian/patches/drop-mplex.patch
@@ -1,10 +1,13 @@
 Description: Drop references to mplex in the settings popup to avoid enabling it
 Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
-Index: dvdstyler-2.1/src/SettingsDlg.cpp
-===================================================================
---- dvdstyler-2.1.orig/src/SettingsDlg.cpp	2012-02-17 20:09:32.000000000 +0000
-+++ dvdstyler-2.1/src/SettingsDlg.cpp	2012-02-18 05:54:17.000000000 +0000
-@@ -213,8 +213,6 @@
+---
+ src/Config.h        |    2 +-
+ src/SettingsDlg.cpp |    4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+--- dvdstyler.orig/src/SettingsDlg.cpp
++++ dvdstyler/src/SettingsDlg.cpp
+@@ -216,8 +216,6 @@ void SettingsDlg::CreatePropPanel(wxSize
  
  	wxSizer* grpSizer = BeginGroup(debugSizer, _("Debug"));
  	AddCheckProp(grpSizer, _("Don't remove temp files"), !s_config.GetRemoveTempFiles(def));
@@ -13,7 +16,7 @@ Index: dvdstyler-2.1/src/SettingsDlg.cpp
  }
  
  bool SettingsDlg::SetValues() {
-@@ -256,8 +254,6 @@
+@@ -263,8 +261,6 @@ bool SettingsDlg::SetValues() {
  	s_config.SetAddECCCmd(GetString(i++));
  	s_config.SetFormatCmd(GetString(i++));
  	s_config.SetRemoveTempFiles(!GetBool(i++));
@@ -22,16 +25,14 @@ Index: dvdstyler-2.1/src/SettingsDlg.cpp
  	return true;
  }
  
-Index: dvdstyler-2.1/src/Config.h
-===================================================================
---- dvdstyler-2.1.orig/src/Config.h	2012-02-17 20:09:55.000000000 +0000
-+++ dvdstyler-2.1/src/Config.h	2012-02-17 20:09:55.000000000 +0000
-@@ -58,7 +58,7 @@
+--- dvdstyler.orig/src/Config.h
++++ dvdstyler/src/Config.h
+@@ -59,7 +59,7 @@ const int DEF_DVD_RESERVED_SPACE = 0; //
  	const wxString DEF_ADD_ECC_CMD   = _T("dvdisaster -mRS02 -n dvd -c -i \"$FILE\"");
  #endif
  const bool DEF_USE_MPLEX = false;
 -const bool DEF_USE_MPLEX_FOR_MENUS = true;
 +const bool DEF_USE_MPLEX_FOR_MENUS = false;
- const wxString DEF_MPLEX_CMD     = _T("mplex -f 8 -S 0 -M -V -o \"$FILE_OUT\" \"$FILE_VIDEO\" \"$FILE_AUDIO\"");
- const wxString DEF_SPUMUX_CMD    = _T("spumux -P -s $STREAM \"$FILE_CONF\"");
- const wxString DEF_DVDAUTHOR_CMD = _T("dvdauthor -o \"$DIR\" -x \"$FILE_CONF\"");
+ #ifdef USE_FFMPEG
+ const wxString DEF_AVCONV_CMD    = _T("ffmpeg");
+ #else

-- 
dvdstyler packaging