Revision: 2327
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2327&view=rev
Author: jcsjcs
Date: 2009-04-18 12:47:27 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Patch from: Daniele Forsi
* src/file.c
scripts/gtkpod-convert-common.sh:
Handle files ending with .oga, .ogv and .ogx the same as
files ending on .ogg
http://wiki.xiph.org/index.php/MIME-Migration#Players.2C_File_managers_etc
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/scripts/gtkpod-convert-common.sh
gtkpod/trunk/src/file.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2009-04-18 12:14:13 UTC (rev 2326)
+++ gtkpod/trunk/ChangeLog 2009-04-18 12:47:27 UTC (rev 2327)
@@ -1,5 +1,17 @@
-2009-04-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+2009-04-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ Patch from: Daniele Forsi
+
+ * src/file.c
+ scripts/gtkpod-convert-common.sh:
+
+ Handle files ending with .oga, .ogv and .ogx the same as
+ files ending on .ogg
+
+
http://wiki.xiph.org/index.php/MIME-Migration#Players.2C_File_managers_etc
+
+2009-04-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
Patch from: Javier Kohen
* src/display_playlists.c
Modified: gtkpod/trunk/scripts/gtkpod-convert-common.sh
===================================================================
--- gtkpod/trunk/scripts/gtkpod-convert-common.sh 2009-04-18 12:14:13 UTC
(rev 2326)
+++ gtkpod/trunk/scripts/gtkpod-convert-common.sh 2009-04-18 12:47:27 UTC
(rev 2327)
@@ -50,12 +50,6 @@
infile="$1"
infile_extension=${infile##*.}
-# Convert the source parameters to lowercase.
-filetype=`echo ${infile_extension}| tr [:upper:] [:lower:]`
-if [ $filetype != flac ] && [ $filetype != ogg ] && [ $filetype != wav ] && [
$filetype != m4a ]; then
- exit 4
-fi
-
if [ "$outfile" = "" ]; then
# Build output file
outfile=`basename "$infile"`
@@ -90,11 +84,16 @@
fi
# Determine decoder
-case $filetype in
+
+# Convert the source extension to lowercase.
+filetype=`echo ${infile_extension}| tr [:upper:] [:lower:]`
+case "$filetype" in
flac) decoder="flac" ; options="-d -c --" ;;
- ogg) decoder="oggdec" ; options="--output - --" ;;
+ oga|ogg|ogv|ogx)
+ decoder="oggdec" ; options="--output - --" ;;
m4a) decoder="faad" ; options="-o -" ;;
wav) decoder="" ;;
+ *) exit 4 ;;
esac
# Check for the existence of decoder
Modified: gtkpod/trunk/src/file.c
===================================================================
--- gtkpod/trunk/src/file.c 2009-04-18 12:14:13 UTC (rev 2326)
+++ gtkpod/trunk/src/file.c 2009-04-18 12:47:27 UTC (rev 2327)
@@ -144,7 +144,10 @@
else if (g_strcasecmp (suf, ".m3u") == 0) type = FILE_TYPE_M3U;
else if (g_strcasecmp (suf, ".pls") == 0) type = FILE_TYPE_PLS;
- else if (g_strcasecmp (suf, ".ogg") == 0) type = FILE_TYPE_OGG;
+ else if (g_strcasecmp (suf, ".oga") == 0) type = FILE_TYPE_OGG;
+ else if (g_strcasecmp (suf, ".ogg") == 0) type = FILE_TYPE_OGG;
+ else if (g_strcasecmp (suf, ".ogv") == 0) type = FILE_TYPE_OGG;
+ else if (g_strcasecmp (suf, ".ogx") == 0) type = FILE_TYPE_OGG;
else if (g_strcasecmp (suf, ".flac") == 0) type = FILE_TYPE_FLAC;
else
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
