You are here: Home » Reply

Reply To: ivorbis

#9429

thorstenhirsch
Participant

Hi guys,

just wanted to say, that I’ve updated the oggdec_tremor.patch. Here it is:

diff -Npur vorbis-tools-1.2.0/Makefile.in vorbis-tools-1.2.0.th/Makefile.in
--- vorbis-tools-1.2.0/Makefile.in 2008-03-02 23:48:02.000000000 -0600
+++ vorbis-tools-1.2.0.th/Makefile.in 2008-03-03 22:46:56.000000000 -0600
@@ -187,7 +187,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @[email protected]
VERSION = @[email protected]
VORBISENC_LIBS = @[email protected]
-VORBISFILE_LIBS = @[email protected]
+VORBISFILE_LIBS = -lvorbisidec
VORBIS_CFLAGS = @[email protected]
VORBIS_LIBS = @[email protected]
WOE32DLL = @[email protected]
diff -Npur vorbis-tools-1.2.0/oggdec/oggdec.c vorbis-tools-1.2.0.th/oggdec/oggdec.c
--- vorbis-tools-1.2.0/oggdec/oggdec.c 2008-03-02 23:37:25.000000000 -0600
+++ vorbis-tools-1.2.0.th/oggdec/oggdec.c 2008-03-03 22:52:35.000000000 -0600
@@ -22,7 +22,7 @@
#include
#endif

-#include
+#include

#include "i18n.h"

@@ -30,10 +30,7 @@ struct option long_options[] = {
{"quiet", 0,0,'Q'},
{"help",0,0,'h'},
{"version", 0, 0, 'v'},
- {"bits", 1, 0, 'b'},
- {"endianness", 1, 0, 'e'},
{"raw", 0, 0, 'R'},
- {"sign", 1, 0, 's'},
{"output", 1, 0, 'o'},
{NULL,0,0,0}
};
@@ -80,7 +77,7 @@ static void parse_options(int argc, char
int option_index = 1;
int ret;

- while((ret = getopt_long(argc, argv, "Qhvb:e:Rs:o:",
+ while((ret = getopt_long(argc, argv, "QhvR:o:",
long_options, &option_index)) != -1)
{
switch(ret)
@@ -96,19 +93,6 @@ static void parse_options(int argc, char
version();
exit(0);
break;
- case 's':
- sign = atoi(optarg);
- break;
- case 'b':
- bits = atoi(optarg);
- if(bits < = 8)
- bits = 8;
- else
- bits = 16;
- break;
- case 'e':
- endian = atoi(optarg);
- break;
case 'o':
outfilename = strdup(optarg);
break;
@@ -306,7 +290,7 @@ static int decode_file(FILE *in, FILE *o
}
}

- while((ret = ov_read(&vf, buf, buflen, endian, bits/8, sign, &bs)) != 0) {
+ while((ret = ov_read(&vf, buf, buflen, &bs)) != 0) {
if(bs != 0) {
vorbis_info *vi = ov_info(&vf, -1);
if(channels != vi->channels || samplerate != vi->rate) {

It is working with the current svn trunk code of tremor (http://svn.xiph.org/trunk/Tremor/) and vorbis-tools-1.2.0. And 2 more infos if you’ve got problems:

    * provide full path names of oggdec, wavstream and flac in mt-daapd-ssc.sh
    * if “ldd `which oggdec`” says, that libivorbis.so.1 could not be found, you might need to configure/update your library cache with ldconfig