summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-02-25 23:36:47 (UTC)
committer llornkcor <llornkcor>2003-02-25 23:36:47 (UTC)
commitbde9ed97c92b6f7eefa8a66d9f58aa4c78127733 (patch) (side-by-side diff)
tree4a74c6083acd5d89e191aaa3629040fb4449ff71
parent689847f2dcaabdfca266efd3c99c81b833bf6e9f (diff)
downloadopie-bde9ed97c92b6f7eefa8a66d9f58aa4c78127733.zip
opie-bde9ed97c92b6f7eefa8a66d9f58aa4c78127733.tar.gz
opie-bde9ed97c92b6f7eefa8a66d9f58aa4c78127733.tar.bz2
add proper number of samples reporting
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp52
1 files changed, 43 insertions, 9 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 9a1ab2a..9d1ff8c 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -74,9 +74,10 @@ public:
int fd;
#if defined(HAVE_MMAP)
void *fdm;
#endif
- unsigned char *data;
+ unsigned long fileLength;
+ unsigned char *data;
unsigned long length;
int eof;
};
@@ -452,13 +453,18 @@ bool LibMadPlugin::open( const QString& path ) {
qDebug("error opening %s", d->input.path );
return FALSE;
}
-#if defined(HAVE_MMAP)
struct stat stat;
if (fstat(d->input.fd, &stat) == -1) {
- //qDebug("error calling fstat"); return FALSE;
+ qDebug("error calling fstat"); return FALSE;
}
+ if (S_ISREG(stat.st_mode) && stat.st_size > 0)
+ d->input.fileLength = stat.st_size;
+ else
+ d->input.fileLength = 0;
+
+#if defined(HAVE_MMAP)
if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
d->input.length = stat.st_size;
d->input.fdm = map_file(d->input.fd, &d->input.length);
if (d->input.fdm == 0) {
@@ -554,21 +560,49 @@ int LibMadPlugin::audioFrequency( int ) {
}
int LibMadPlugin::audioSamples( int ) {
- debugMsg( "LibMadPlugin::audioSamples" );
+ debugMsg( "LibMadPlugin::audioSamples" );
+
+ long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
+ mad_header_decode( (struct mad_header *)&d->frame.header, &d->stream );
+/*
+ qDebug( "LibMadPlugin::audioSamples: %i*%i", d->frame.header.duration.seconds,
+ d->frame.header.samplerate );
+ return d->frame.header.duration.seconds * d->frame.header.samplerate;
+*/
+ if ( d->frame.header.bitrate == 0 )
+ return 0;
+ int samples = (d->input.fileLength / (d->frame.header.bitrate/8)) * d->frame.header.samplerate;
+
+ qDebug( "LibMadPlugin::audioSamples: %i * %i * 8 / %i", (int)d->input.fileLength,
+ (int)d->frame.header.samplerate, (int)d->frame.header.bitrate );
+ qDebug( "LibMadPlugin::audioSamples: %i", samples );
- // long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-// mad_header_decode( (struct mad_header *)&d->frame.header, &d->stream );
-// qDebug( "LibMadPlugin::audioSamples: %i*%i", d->frame.header.duration.seconds, d->frame.header.samplerate );
-// return d->frame.header.duration.seconds * d->frame.header.samplerate;
+ return samples;
- return 10000000;
+// return 10000000;
}
bool LibMadPlugin::audioSetSample( long, int ) {
debugMsg( "LibMadPlugin::audioSetSample" );
+
+// long totalSamples = audioSamples(0);
+// if ( totalSamples <= 1 )
+// return FALSE;
+
+// // Seek to requested position
+// qDebug( "seek pos: %i", (int)((double)pos * d->input.fileLength / totalSamples) );
+// ::lseek( d->input.fd, (long)((double)pos * d->input.fileLength / totalSamples), SEEK_SET );
+// mad_stream_sync(&d->stream);
+
+// mad_stream_init(&d->stream);
+// mad_frame_init(&d->frame);
+// mad_synth_init(&d->synth);
+
+// return TRUE;
+ debugMsg( "LibMadPlugin::audioSetSample" );
return FALSE;
}