- read(2) and write(2) are not part of the std namespace

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
@@ -232,221 +232,221 @@ int LibMadPlugin::udp_open(char *address, int port) {
         /* Register to a multicast address */
         stMreq.imr_multiaddr.s_addr = stAddr.sin_addr.s_addr;
         stMreq.imr_interface.s_addr = INADDR_ANY;
         if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&stMreq, sizeof(stMreq)) < 0) {
             return (0);
         }
     } else {
         /* Bind the socket to port */
         stLclAddr.sin_family = AF_INET;
         stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
         stLclAddr.sin_port = htons(0);
         if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) {
             return (0);
         }
     }
     return (sock);
 }
 
 int LibMadPlugin::tcp_open(char *address, int port) {
     struct sockaddr_in stAddr;
     struct hostent *host;
     int sock;
     struct linger l;
 
     memset(&stAddr, 0, sizeof(stAddr));
     stAddr.sin_family = AF_INET;
     stAddr.sin_port = htons(port);
 
     if ((host = gethostbyname(address)) == NULL) {
         return (0);
     }
 
     stAddr.sin_addr = *((struct in_addr *)host->h_addr_list[0]);
 
     if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
         return (0);
     }
 
     l.l_onoff = 1;
     l.l_linger = 5;
     if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l)) < 0) {
         return (0);
     }
 
     if (connect(sock, (struct sockaddr *)&stAddr, sizeof(stAddr)) < 0) {
         return (0);
     }
 
     return (sock);
 }
 
 
 /**
  * Read a http line header.
  * This function read character by character.
  * @param tcp_sock the socket use to read the stream
  * @param buf a buffer to receive the data
  * @param size size of the buffer
  * @return the size of the stream read or -1 if an error occured
  */
 int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) {
     int offset = 0;
 
     do {
-        if (std::read(tcp_sock, buf + offset, 1) < 0)
+        if (::read(tcp_sock, buf + offset, 1) < 0)
             return -1;
         if (buf[offset] != '\r')    /* Strip \r from answer */
             offset++;
     } while (offset < size - 1 && buf[offset - 1] != '\n');
 
     buf[offset] = 0;
     return offset;
 }
 
 int LibMadPlugin::http_open(const QString& path ) {
     char *host;
     int port;
     char *request;
     int tcp_sock;
     char http_request[PATH_MAX];
     char filename[PATH_MAX];
     //char c;
     char *arg =strdup(path.latin1());
 
     /* Check for URL syntax */
     if (strncmp(arg, "http://", strlen("http://"))) {
         return (0);
     }
 
     /* Parse URL */
     port = 80;
     host = arg + strlen("http://");
     if ((request = strchr(host, '/')) == NULL) {
         return (0);
     }
 
     *request++ = 0;
 
     if (strchr(host, ':') != NULL) { /* port is specified */
         port = atoi(strchr(host, ':') + 1);
         *strchr(host, ':') = 0;
     }
 
     /* Open a TCP socket */
     if (!(tcp_sock = tcp_open(host, port))) {
         perror("http_open");
         return (0);
     }
 
     snprintf(filename, sizeof(filename) - strlen(host) - 75, "%s", request);
 
     /* Send HTTP GET request */
     /* Please don't use a Agent know by shoutcast (Lynx, Mozilla) seems to be reconized and print
      * a html page and not the stream */
     snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n"
     /*  "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */
         "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host);
 
     send(tcp_sock, http_request, strlen(http_request), 0);
 
     /* Parse server reply */
 #if 0
     do
         read(tcp_sock, &c, sizeof(char));
     while (c != ' ');
     read(tcp_sock, http_request, 4 * sizeof(char));
     http_request[4] = 0;
     if (strcmp(http_request, "200 "))     {
         fprintf(stderr, "http_open: ");
         do {
             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);
+            ::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("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();