Diffstat (limited to 'core/multimedia/opieplayer/libmad') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 319e0ff..eda5859 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp | |||
@@ -290,13 +290,13 @@ int LibMadPlugin::tcp_open(char *address, int port) { | |||
290 | * @return the size of the stream read or -1 if an error occured | 290 | * @return the size of the stream read or -1 if an error occured |
291 | */ | 291 | */ |
292 | int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { | 292 | int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { |
293 | int offset = 0; | 293 | int offset = 0; |
294 | 294 | ||
295 | do { | 295 | do { |
296 | if (std::read(tcp_sock, buf + offset, 1) < 0) | 296 | if (::read(tcp_sock, buf + offset, 1) < 0) |
297 | return -1; | 297 | return -1; |
298 | if (buf[offset] != '\r') /* Strip \r from answer */ | 298 | if (buf[offset] != '\r') /* Strip \r from answer */ |
299 | offset++; | 299 | offset++; |
300 | } while (offset < size - 1 && buf[offset - 1] != '\n'); | 300 | } while (offset < size - 1 && buf[offset - 1] != '\n'); |
301 | 301 | ||
302 | buf[offset] = 0; | 302 | buf[offset] = 0; |
@@ -382,13 +382,13 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
382 | qDebug( "http_open: "+ QString(strerror(errno)) +"\n"); | 382 | qDebug( "http_open: "+ QString(strerror(errno)) +"\n"); |
383 | return 0; | 383 | return 0; |
384 | } | 384 | } |
385 | 385 | ||
386 | if (QString(http_request).left(9) == "Location:") { | 386 | if (QString(http_request).left(9) == "Location:") { |
387 | /* redirect */ | 387 | /* redirect */ |
388 | std::close(tcp_sock); | 388 | ::close(tcp_sock); |
389 | http_request[strlen(http_request) - 1] = '\0'; | 389 | http_request[strlen(http_request) - 1] = '\0'; |
390 | return http_open(&http_request[10]); | 390 | return http_open(&http_request[10]); |
391 | } | 391 | } |
392 | 392 | ||
393 | if (QString(http_request).left(4) == "ICY ") { | 393 | if (QString(http_request).left(4) == "ICY ") { |
394 | /* This is shoutcast/icecast streaming */ | 394 | /* This is shoutcast/icecast streaming */ |