summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-23 00:04:57 (UTC)
committer llornkcor <llornkcor>2002-04-23 00:04:57 (UTC)
commit228dffdc2721ee13ca9491584d8cc46cd4807cc1 (patch) (side-by-side diff)
treeb0431ae74b7a64272748899c556165d194a09740
parentb3190f8be01fb364f89d9de0a0dddb9a5ccebe77 (diff)
downloadopie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.zip
opie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.tar.gz
opie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.tar.bz2
config fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index c744c6d..319e0ff 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -362,129 +362,129 @@ int LibMadPlugin::http_open(const QString& path ) {
read(tcp_sock, &c, sizeof(char));
fprintf(stderr, "%c", c);
} while (c != '\r');
fprintf(stderr, "\n");
return (0);
}
#endif
QString name;
QString genre;
QString bitrate;
QString url;
QString message = tr("Info: ");
do {
int len;
len = http_read_line(tcp_sock, http_request, sizeof(http_request));
if (len == -1) {
qDebug( "http_open: "+ QString(strerror(errno)) +"\n");
return 0;
}
if (QString(http_request).left(9) == "Location:") {
/* redirect */
std::close(tcp_sock);
http_request[strlen(http_request) - 1] = '\0';
return http_open(&http_request[10]);
}
if (QString(http_request).left(4) == "ICY ") {
/* This is shoutcast/icecast streaming */
if (strncmp(http_request + 4, "200 ", 4)) {
qDebug("http_open: " + QString(http_request) + "\n");
return 0;
}
} else if (QString(http_request).left(4) == "icy-") {
/* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */
if ( QString( http_request ).left( 8 ) == "icy-name" ) {
name = tr("Name: ") + QString(http_request).mid(9, (QString(http_request).length())- 9 );
} else if ( QString( http_request ).left( 9 ) == "icy-genre" ) {
genre = tr("Genre: ") + QString(http_request).mid(10, (QString(http_request).length())-10 );
} else if ( QString( http_request ).left( 6 ) == "icy-br" ) {
bitrate = tr("Bitrate: ") + QString(http_request).mid(7, (QString(http_request).length())- 7 );
} else if ( QString( http_request ).left( 7 ) == "icy-url" ) {
url = tr("URL: ") + QString(http_request).mid(8, (QString(http_request).length())- 8 );
} else if ( QString( http_request ).left( 10 ) == "icy-notice" ) {
message += QString(http_request).mid(11, QString(http_request).length()-11 ) ;
}
}
} while (strcmp(http_request, "\n") != 0);
info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
qDebug("Stream info: " + info);
return (tcp_sock);
}
bool LibMadPlugin::open( const QString& path ) {
debugMsg( "LibMadPlugin::open" );
- Config cfg("MediaPlayer");
+ Config cfg("OpiePlayer");
cfg.setGroup("Options");
bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
qDebug("buffer size is %d", bufferSize);
d->bad_last_frame = 0;
d->flush = TRUE;
info = QString( "" );
//qDebug( "Opening %s", path.latin1() );
if (path.left( 4 ) == "http" ) {
qDebug("Test2");
// in case of any error we get 0 here
if ( !(http_open(path) == 0) ) {
qDebug("Test3");
d->input.fd = http_open(path);
} else {
qDebug("Test5");
return FALSE;
}
} else {
qDebug("Test4");
d->input.path = path.latin1();
d->input.fd = ::open( d->input.path, O_RDONLY );
// thats a better place, since it should only seek for ID3 tags on mp3 files, not streams
printID3Tags();
}
if (d->input.fd == -1) {
qDebug("error opening %s", d->input.path );
return FALSE;
}
// printID3Tags();
#if defined(HAVE_MMAP)
struct stat stat;
if (fstat(d->input.fd, &stat) == -1) {
//qDebug("error calling fstat"); return FALSE;
}
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) {
qDebug("error mmapping file"); return FALSE;
}
d->input.data = (unsigned char *)d->input.fdm;
}
#endif
if (d->input.data == 0) {
d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
if (d->input.data == 0) {
qDebug("error allocating input buffer");
return FALSE;
}
d->input.length = 0;
}
d->input.eof = 0;
mad_stream_init(&d->stream);
mad_frame_init(&d->frame);
mad_synth_init(&d->synth);