| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 159 |
1 files changed, 83 insertions, 76 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 7de4282..0f952f4 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp @@ -17,6 +17,8 @@ ** not clear to you. ** **********************************************************************/ +// largly modified by Maximilian Reiss <max.reiss@gmx.de> + #include <stdio.h> #include <stdarg.h> #include <stdlib.h> @@ -31,7 +33,10 @@ #include <locale.h> #include <math.h> #include <assert.h> + #include <qapplication.h> +#include <qmessagebox.h> + #include <qpe/config.h> // for network handling @@ -198,45 +203,47 @@ int LibMadPlugin::udp_open(char *address, int port) { stAddr.sin_family = AF_INET; stAddr.sin_port = htons(port); - if ((host = gethostbyname(address)) == NULL) + if ((host = gethostbyname(address)) == NULL) { return (0); + } stAddr.sin_addr = *((struct in_addr *)host->h_addr_list[0]); /* Create a UDP socket */ - if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { return (0); + } /* Allow multiple instance of the client to share the same address and port */ - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&enable, sizeof(unsigned long int)) < 0) + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&enable, sizeof(unsigned long int)) < 0) { return (0); + } /* If the address is multicast, register to the multicast group */ - if (is_address_multicast(stAddr.sin_addr.s_addr)) - { + if (is_address_multicast(stAddr.sin_addr.s_addr)) { /* Bind the socket to port */ stLclAddr.sin_family = AF_INET; stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY); stLclAddr.sin_port = stAddr.sin_port; - if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) + if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) { return (0); + } /* 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) + if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&stMreq, sizeof(stMreq)) < 0) { return (0); } - else - { + } 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) + if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) { return (0); } - + } return (sock); } @@ -250,21 +257,25 @@ int LibMadPlugin::tcp_open(char *address, int port) { stAddr.sin_family = AF_INET; stAddr.sin_port = htons(port); - if ((host = gethostbyname(address)) == NULL) + 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) + 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) + if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l)) < 0) { return (0); + } - if (connect(sock, (struct sockaddr *)&stAddr, sizeof(stAddr)) < 0) + if (connect(sock, (struct sockaddr *)&stAddr, sizeof(stAddr)) < 0) { return (0); + } return (sock); } @@ -281,14 +292,12 @@ int LibMadPlugin::tcp_open(char *address, int port) { int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { int offset = 0; - do - { + do { if (std::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'); + } while (offset < size - 1 && buf[offset - 1] != '\n'); buf[offset] = 0; return offset; @@ -305,25 +314,26 @@ int LibMadPlugin::http_open(const QString& path ) { char *arg =strdup(path.latin1()); /* Check for URL syntax */ - if (strncmp(arg, "http://", strlen("http://"))) + if (strncmp(arg, "http://", strlen("http://"))) { return (0); + } /* Parse URL */ port = 80; host = arg + strlen("http://"); - if ((request = strchr(host, '/')) == NULL) + if ((request = strchr(host, '/')) == NULL) { return (0); + } + *request++ = 0; - if (strchr(host, ':') != NULL) /* port is specified */ - { + 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))) - { + if (!(tcp_sock = tcp_open(host, port))) { perror("http_open"); return (0); } @@ -346,34 +356,35 @@ int LibMadPlugin::http_open(const QString& path ) { while (c != ' '); read(tcp_sock, http_request, 4 * sizeof(char)); http_request[4] = 0; - if (strcmp(http_request, "200 ")) - { + if (strcmp(http_request, "200 ")) { fprintf(stderr, "http_open: "); - do - { + do { read(tcp_sock, &c, sizeof(char)); fprintf(stderr, "%c", c); - } - while (c != '\r'); + } while (c != '\r'); fprintf(stderr, "\n"); return (0); } #endif - do - { + 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) - { + if (len == -1) { fprintf(stderr, "http_open: %s\n", strerror(errno)); return 0; } - if (strncmp(http_request, "Location:", 9) == 0) - { + if (strncmp(http_request, "Location:", 9) == 0) { /* redirect */ std::close(tcp_sock); @@ -382,28 +393,37 @@ int LibMadPlugin::http_open(const QString& path ) { return http_open(&http_request[10]); } - if (strncmp(http_request, "ICY ", 4) == 0) - { + if (strncmp(http_request, "ICY ", 4) == 0) { /* This is icecast streaming */ - if (strncmp(http_request + 4, "200 ", 4)) - { + if (strncmp(http_request + 4, "200 ", 4)) { fprintf(stderr, "http_open: %s\n", http_request); return 0; } - } - else if (strncmp(http_request, "icy-", 4) == 0) - { + } else if (strncmp(http_request, "icy-", 4) == 0) { /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */ - /* Don't print these - mpg123 doesn't */ - /* fprintf(stderr,"%s\n",http_request); */ + 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); + } 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"); @@ -418,23 +438,27 @@ bool LibMadPlugin::open( const QString& path ) { if (path.left( 4 ) == "http" ) { + // in case of any error we get 0 here + if ( !(http_open(path)==0) ) { d->input.fd = http_open(path); - + } } else { 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 ); +// qDebug("error opening %s", d->input.path ); return FALSE; } - printID3Tags(); +// printID3Tags(); #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.length = stat.st_size; @@ -648,8 +672,7 @@ static const int bits = 16; static const int shift = MAD_F_FRACBITS + 1 - bits; -inline long audio_linear_dither( mad_fixed_t sample, mad_fixed_t& error ) -{ +inline long audio_linear_dither( mad_fixed_t sample, mad_fixed_t& error ) { sample += error; mad_fixed_t quantized = (sample >= MAD_F_ONE) ? MAD_F_ONE - 1 : ( (sample < -MAD_F_ONE) ? -MAD_F_ONE : sample ); quantized &= ~((1L << shift) - 1); @@ -658,8 +681,7 @@ inline long audio_linear_dither( mad_fixed_t sample, mad_fixed_t& error ) } -inline void audio_pcm( short *data, unsigned int nsamples, mad_fixed_t *left, mad_fixed_t *right ) -{ +inline void audio_pcm( short *data, unsigned int nsamples, mad_fixed_t *left, mad_fixed_t *right ) { if ( right ) { while (nsamples--) { data[0] = audio_linear_dither( *left++, left_err ); @@ -685,8 +707,9 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) { static int maxBuffered = 8000; // 65536; - if ( samples > maxBuffered ) + if ( samples > maxBuffered ) { samples = maxBuffered; + } if ( d->flush ) { buffered = 0; @@ -715,27 +738,22 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) { offset += decodedSamples; buffered += decodedSamples; } + //qApp->processEvents(); audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 ); // audio_pcm( output, samples, buffer[1], buffer[0] ); // audio_pcm( output, samples, buffer[0], buffer[1] ); samplesMade = samples; memmove( buffer[0], &(buffer[0][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); - if ( d->synth.pcm.channels == 2 ) + if ( d->synth.pcm.channels == 2 ) { memmove( buffer[1], &(buffer[1][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); + } buffered -= samples; return TRUE; } -/* -bool LibMadPlugin::audioReadMonoSamples( short *, long, long&, int ) { - debugMsg( "LibMadPlugin::audioReadMonoSamples" ); - return FALSE; -} - - -bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { +/*bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { */ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long samples, long& samplesMade, int ) { debugMsg( "LibMadPlugin::audioReadStereoSamples" ); @@ -748,9 +766,6 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl do { if ( needInput ) if ( !read() ) { -// if ( d->input.eof ) -// needInput = FALSE; -// else return FALSE; } @@ -762,15 +777,7 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl needInput = TRUE; } while ( ( samplesMade < samples ) && ( !d->input.eof ) ); -/* - static bool firstTimeThru = TRUE; - if ( firstTimeThru ) { - firstTimeThru = FALSE; - decode( output, samples, samplesMade ); - return FALSE; - } else -*/ return FALSE; } |