author | harlekin <harlekin> | 2002-04-22 22:05:28 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-04-22 22:05:28 (UTC) |
commit | 1ce5e1128e3c062d45e6dcfbcda20f195b4d5b13 (patch) (side-by-side diff) | |
tree | 81303ba33d6f6aa7e56b9ea6ff6d85a7a894ede0 /core/multimedia/opieplayer/libmad/libmadplugin.cpp | |
parent | f77f012023dbe7582a4b4297f61c6521ad8a3aa5 (diff) | |
download | opie-1ce5e1128e3c062d45e6dcfbcda20f195b4d5b13.zip opie-1ce5e1128e3c062d45e6dcfbcda20f195b4d5b13.tar.gz opie-1ce5e1128e3c062d45e6dcfbcda20f195b4d5b13.tar.bz2 |
more updates for shoutcast
Diffstat (limited to 'core/multimedia/opieplayer/libmad/libmadplugin.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 0f952f4..8b692ef 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp @@ -312,3 +312,3 @@ int LibMadPlugin::http_open(const QString& path ) { char filename[PATH_MAX]; - char c; + //char c; char *arg =strdup(path.latin1()); @@ -374,3 +374,2 @@ int LibMadPlugin::http_open(const QString& path ) { QString message = tr("Info: "); - do { @@ -382,3 +381,3 @@ int LibMadPlugin::http_open(const QString& path ) { if (len == -1) { - fprintf(stderr, "http_open: %s\n", strerror(errno)); + qDebug( "http_open: "+ QString(strerror(errno)) +"\n"); return 0; @@ -386,8 +385,6 @@ int LibMadPlugin::http_open(const QString& path ) { - if (strncmp(http_request, "Location:", 9) == 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]); @@ -395,9 +392,9 @@ int LibMadPlugin::http_open(const QString& path ) { - if (strncmp(http_request, "ICY ", 4) == 0) { - /* This is icecast streaming */ + if (QString(http_request).left(4) == "ICY ") { + /* This is shoutcast/icecast streaming */ if (strncmp(http_request + 4, "200 ", 4)) { - fprintf(stderr, "http_open: %s\n", http_request); + qDebug("http_open: " + QString(http_request) + "\n"); return 0; } - } else if (strncmp(http_request, "icy-", 4) == 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 */ |