diff -ruN burn-0.2.0-beta5/chain-dvd.c burn-0.2.0-beta5.patched//chain-dvd.c --- burn-0.2.0-beta5/chain-dvd.c 2010-12-03 19:09:56.000000000 +0100 +++ burn-0.2.0-beta5.patched//chain-dvd.c 2011-01-05 16:55:02.640000022 +0100 @@ -309,15 +309,7 @@ { // insert requant step if required if (get_job().get_requant_factor() > 1) { - const char* requant_call; - if ( global_setup().RequantType == requanttype_transcode ) - requant_call = "tcrequant"; - else if ( global_setup().RequantType == requanttype_metakine ) - requant_call = "requant"; - else - requant_call = "lxrequant"; - - shellprocess* requant = new shellprocess( "requant", shellescape( "vdrburn-dvd.sh" ) + requant_call ); + shellprocess* requant = new shellprocess( "requant", shellescape( "vdrburn-dvd.sh" ) + "requant" ); requant->put_environment("VIDEO_FILE", m_currentRecording->get_video_track_path()); requant->put_environment("REQUANT_FILE", m_currentRecording->get_requant_path()); requant->put_environment("REQUANT_FACTOR", get_job().get_requant_factor()); diff -ruN burn-0.2.0-beta5/common.c burn-0.2.0-beta5.patched//common.c --- burn-0.2.0-beta5/common.c 2010-12-11 14:10:15.000000000 +0100 +++ burn-0.2.0-beta5.patched//common.c 2011-01-05 16:56:07.849000022 +0100 @@ -74,11 +74,6 @@ { tr("ProjectX") }; //{ tr("VDRSync"), tr("ProjectX") }; - // --- requanttype -------------------------------------------------------- - - const char* requanttype_strings[requanttype_count] = - { tr("M2VRequantizer"), tr("Transcode") , tr("lxdvdrip") }; - int ScanPageCount(const std::string& Path) { cString path = AddDirectory(Path.c_str(), "menu-bg-*.png"); diff -ruN burn-0.2.0-beta5/common.h burn-0.2.0-beta5.patched//common.h --- burn-0.2.0-beta5/common.h 2010-12-11 14:07:41.000000000 +0100 +++ burn-0.2.0-beta5.patched//common.h 2011-01-05 16:56:44.306000024 +0100 @@ -195,22 +195,6 @@ const int demuxtype_count( demuxtype_projectx + 1 ); extern const char* demuxtype_strings[demuxtype_count]; - //!--- requanttype -------------------------------------------------------- - - enum requanttype - { - requanttype_metakine, - requanttype_transcode, - requanttype_lxdvdrip, - }; - - const int requanttype_count = requanttype_lxdvdrip + 1; - extern const char* requanttype_strings[requanttype_count]; - - int ScanPageCount(const std::string& Path); - std::string progress_bar(double current, double total, int length = 20); - void trim_left( std::string& text_, const char* characters_, std::string::size_type offset_ = 0 ); - //!--- recording helper functions ----------------------------------------- std::string get_recording_datetime(const cRecording* recording_, char delimiter = '\t'); diff -ruN burn-0.2.0-beta5/po/de_DE.po burn-0.2.0-beta5.patched//po/de_DE.po --- burn-0.2.0-beta5/po/de_DE.po 2010-12-11 19:52:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/de_DE.po 2011-01-05 16:59:24.976000026 +0100 @@ -81,15 +81,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "M2VRequantizer" - -msgid "Transcode" -msgstr "Transcode" - -msgid "lxdvdrip" -msgstr "lxdvdrip" - msgid "Couldn't convert character sets!" msgstr "" @@ -303,9 +294,6 @@ msgid "Demux using" msgstr "Demultiplexer" -msgid "Requant using" -msgstr "Verkleinern mit" - msgid "Burn speed" msgstr "Brenngeschwindigkeit" diff -ruN burn-0.2.0-beta5/po/fi_FI.po burn-0.2.0-beta5.patched//po/fi_FI.po --- burn-0.2.0-beta5/po/fi_FI.po 2010-12-11 19:52:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/fi_FI.po 2011-01-05 17:00:33.566000026 +0100 @@ -87,15 +87,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "M2VRequantizer" - -msgid "Transcode" -msgstr "Transcode" - -msgid "lxdvdrip" -msgstr "lxdvdrip" - msgid "Couldn't convert character sets!" msgstr "Merkistömuunnos epäonnistui!" @@ -310,9 +301,6 @@ msgid "Demux using" msgstr "Demuksausohjelmisto" -msgid "Requant using" -msgstr "Requant-ohjelmisto" - msgid "Burn speed" msgstr "Polttonopeus" diff -ruN burn-0.2.0-beta5/po/fr_FR.po burn-0.2.0-beta5.patched//po/fr_FR.po --- burn-0.2.0-beta5/po/fr_FR.po 2010-12-11 19:52:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/fr_FR.po 2011-01-05 17:00:50.671000030 +0100 @@ -84,15 +84,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "" - -msgid "Transcode" -msgstr "" - -msgid "lxdvdrip" -msgstr "" - msgid "Couldn't convert character sets!" msgstr "" @@ -307,9 +298,6 @@ msgid "Demux using" msgstr "Demultipléxeur" -msgid "Requant using" -msgstr "" - msgid "Burn speed" msgstr "Vitesse de gravure" diff -ruN burn-0.2.0-beta5/po/it_IT.po burn-0.2.0-beta5.patched//po/it_IT.po --- burn-0.2.0-beta5/po/it_IT.po 2010-12-12 10:39:21.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/it_IT.po 2011-01-05 17:01:20.105000024 +0100 @@ -86,15 +86,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "M2VRequantizer" - -msgid "Transcode" -msgstr "Transcode" - -msgid "lxdvdrip" -msgstr "lxdvdrip" - msgid "Couldn't convert character sets!" msgstr "Impossibile convertire insieme di caratteri!" @@ -309,9 +300,6 @@ msgid "Demux using" msgstr "Utilizza Demux" -msgid "Requant using" -msgstr "Utilizza Requant" - msgid "Burn speed" msgstr "Velocità scrittura" diff -ruN burn-0.2.0-beta5/po/nl_NL.po burn-0.2.0-beta5.patched//po/nl_NL.po --- burn-0.2.0-beta5/po/nl_NL.po 2010-12-11 19:52:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/nl_NL.po 2011-01-05 17:01:59.924000031 +0100 @@ -81,15 +81,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "M2VRequantizer" - -msgid "Transcode" -msgstr "Transcode" - -msgid "lxdvdrip" -msgstr "lxdvdrip" - msgid "Couldn't convert character sets!" msgstr "Kan karaktersets niet converteren!" @@ -304,9 +295,6 @@ msgid "Demux using" msgstr "Demultiplexer" -msgid "Requant using" -msgstr "Verkleinen met" - msgid "Burn speed" msgstr "Brandsnelheid" diff -ruN burn-0.2.0-beta5/po/ru_RU.po burn-0.2.0-beta5.patched//po/ru_RU.po --- burn-0.2.0-beta5/po/ru_RU.po 2010-12-11 19:52:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//po/ru_RU.po 2011-01-05 17:05:24.818000030 +0100 @@ -81,15 +81,6 @@ msgid "ProjectX" msgstr "ProjectX" -msgid "M2VRequantizer" -msgstr "M2VRequantizer" - -msgid "Transcode" -msgstr "Transcode" - -msgid "lxdvdrip" -msgstr "" - msgid "Couldn't convert character sets!" msgstr "" @@ -305,9 +296,6 @@ msgid "Demux using" msgstr "´ÕÜãÛìâØßÛÕÚáÞà" -msgid "Requant using" -msgstr "ÃÜÕÝìèØâì á ßÞÜÞéìî" - msgid "Burn speed" msgstr "ÁÚÞàÞáâì ×ÐßØáØ" diff -ruN burn-0.2.0-beta5/setup.c burn-0.2.0-beta5.patched//setup.c --- burn-0.2.0-beta5/setup.c 2010-12-11 14:14:42.000000000 +0100 +++ burn-0.2.0-beta5.patched//setup.c 2011-01-05 16:57:31.940000024 +0100 @@ -92,7 +92,6 @@ PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ), PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ), PROCTOOLS_INIT_PROPERTY( DemuxType, demuxtype_projectx ), - PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_metakine ), PROCTOOLS_INIT_PROPERTY( PreserveLogFiles, false ), PROCTOOLS_INIT_PROPERTY( DefaultLanguage, 0 ), PROCTOOLS_INIT_PROPERTY( MainMenuStatus, true ), @@ -219,7 +218,6 @@ Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) ); Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) ); Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) ); - Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) ); Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) ); Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) ); Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) ); diff -ruN burn-0.2.0-beta5/setup.h burn-0.2.0-beta5.patched//setup.h --- burn-0.2.0-beta5/setup.h 2010-12-11 13:59:52.000000000 +0100 +++ burn-0.2.0-beta5.patched//setup.h 2011-01-05 16:58:11.450000022 +0100 @@ -43,7 +43,6 @@ proctools::property< int > CustomDiskSize; proctools::property< int > BurnSpeed; proctools::property< int > DemuxType; - proctools::property< int > RequantType; proctools::property< bool > PreserveLogFiles; proctools::property< int > DefaultLanguage; proctools::property< bool > MainMenuStatus; diff -ruN burn-0.2.0-beta5/vdrburn-dvd.sh burn-0.2.0-beta5.patched//vdrburn-dvd.sh --- burn-0.2.0-beta5/vdrburn-dvd.sh 2010-12-11 17:59:00.000000000 +0100 +++ burn-0.2.0-beta5.patched//vdrburn-dvd.sh 2011-01-05 16:51:34.625000015 +0100 @@ -123,24 +123,13 @@ ;; requant) + REQUANT=$(which requant 2>&- || which tcrequant 2>&- || which requant_lxdvdrip 2>&-) REQUANT_FACTOR=$(echo "$REQUANT_FACTOR" | tr ',' '.') - echo requant $REQUANT_FACTOR 3 $VIDEO_SIZE - requant $REQUANT_FACTOR 3 $VIDEO_SIZE < "$VIDEO_FILE" > "$REQUANT_FILE" + echo $REQUANT $REQUANT_FACTOR 3 $VIDEO_SIZE + $REQUANT $REQUANT_FACTOR 3 $VIDEO_SIZE < "$VIDEO_FILE" > "$REQUANT_FILE" rm -f "$VIDEO_FILE" ;; - tcrequant) - REQUANT_FACTOR=$(echo "$REQUANT_FACTOR" | tr ',' '.') - echo tcrequant -f $REQUANT_FACTOR - tcrequant -f $REQUANT_FACTOR < "$VIDEO_FILE" > "$REQUANT_FILE" - rm -f "$VIDEO_FILE" - ;; - - lxrequant) - echo requant_lxdvdrip -f $REQUANT_FACTOR - requant_lxdvdrip -f $REQUANT_FACTOR -i "$VIDEO_FILE" -o "$REQUANT_FILE" - rm -f "$VIDEO_FILE" - ;; mplex) MPLEX_OPTS="-S 0"