[Kde-imaging] kdeextragear-libs-1/kipi-plugins/mpegencoder

[Gilles Caulier]

CVS commit by cgilles: 

MPEGEncoder :
-Fixed kipi url
-Added new audio Wav sampling to 48000 for to use with DVD author !

Thanks to "bcl.man" for this patch

CCMAIL: kde-imaging at kde.org, bcl.man at free.fr


  M +9 -6      images2mpg   1.2


--- kdeextragear-libs-1/kipi-plugins/mpegencoder/images2mpg  #1.1:1.2
@@ -25,6 +25,5 @@
 #               the final MPEG file to a DVD/XVCD/SVCD/VCD format compatible with vcdimager program.
 #
-# # PENDING(blackie) update URL to point to a kipi webpage.
-# You can use the 'KIPI' KDE frontend with this script. Look this URL : http://digikam.sourceforge.net
+# You can use the 'KIPI' KDE frontend with this script. Look this URL : http://extragear.kde.org/apps/kipi
 #
 # Return value : 0 -> Process finish succefuly.
@@ -66,5 +65,5 @@
 # -------------------------------------------------------------------------------------------------------
 #
-# AUTHOR : CAULIER gilles <caulier.gilles at free.fr>
+# AUTHOR : CAULIER gilles <caulier dot gilles at free.fr>
 #
 # -------------------------------------------------------------------------------------------------------
@@ -456,5 +455,5 @@
 Options:
    -v <num>                    : verbose level [0:none=default, 1:infos+warnings, 2:debug].
-   --with-gui                  : running with 'KIPI' KDE GUI frontend [see http://digikam.sourceforge.net]. # PENDING(blackie) update URL
+   --with-gui                  : running with 'KIPI' KDE GUI frontend [see http://extragear.kde.org/apps/kipi]. 
    -t <num>                    : enable transition between images with the speed [1=slow, 2, 4, 5, 10, 20=fast].
    -T <Temporary folder>       : use a specific folder for creating the temporary files (ex: '/tmp').
@@ -631,4 +630,5 @@
       BUFFER_SIZE=46
       VIDEOFORMAT_MESSAGE="VCD"
+      AUDIO_WAVE_CONVERSION="-V"
       ;;
     SVCD)
@@ -637,4 +637,5 @@
       BUFFER_SIZE=230
       VIDEOFORMAT_MESSAGE="SVCD"
+      AUDIO_WAVE_CONVERSION="-V"
       ;;
     XVCD)
@@ -648,4 +649,5 @@
       BUFFER_SIZE=230
       VIDEOFORMAT_MESSAGE="XVCD"
+      AUDIO_WAVE_CONVERSION="-V"      
       ;;
     DVD)
@@ -659,4 +661,5 @@
       BUFFER_SIZE=230
       VIDEOFORMAT_MESSAGE="DVD"
+      AUDIO_WAVE_CONVERSION="-b 224 -r 48000 -s"
       ;;
     *)
@@ -838,6 +841,6 @@
             echo -e "\nEncoding audio file...\n" >&2
         fi
-        cat "$AUDIO_WAV" | $MP2ENC_BIN -v $VERBOSE -V -o "$TMPFILENAME.tmp.mp2"
-        AUDIOFILENAME="$TMPFILENAME.tmp.mp2"
+        cat "$AUDIO_WAV" | $MP2ENC_BIN -v $VERBOSE $AUDIO_WAVE_CONVERSION -o "$TMPFILENAME.tmp.mp2"
+        AUDIOFILENAME="$TMPFILENAME.tmp.mp2"        
     fi
 fi