author | harlekin <harlekin> | 2002-04-20 18:38:39 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-04-20 18:38:39 (UTC) |
commit | 703c9c483b5e3fa6d2090398d6ee3a5638326b02 (patch) (unidiff) | |
tree | 1e965c35afc244ae31f5842047fe27bb2dd3f2cc | |
parent | 758c9e817087252894b15c6f7476c1f16a02f65d (diff) | |
download | opie-703c9c483b5e3fa6d2090398d6ee3a5638326b02.zip opie-703c9c483b5e3fa6d2090398d6ee3a5638326b02.tar.gz opie-703c9c483b5e3fa6d2090398d6ee3a5638326b02.tar.bz2 |
ugly hack for the beginning
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 189 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.h | 9 |
2 files changed, 193 insertions, 5 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 8ede537..0fcc230 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp | |||
@@ -5,64 +5,72 @@ | |||
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <stdarg.h> | 21 | #include <stdarg.h> |
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | #include <sys/types.h> | 23 | #include <sys/types.h> |
24 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
25 | #include <fcntl.h> | 25 | #include <fcntl.h> |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #include <string.h> | 27 | #include <string.h> |
28 | #include <ctype.h> | 28 | #include <ctype.h> |
29 | #include <errno.h> | 29 | #include <errno.h> |
30 | #include <time.h> | 30 | #include <time.h> |
31 | #include <locale.h> | 31 | #include <locale.h> |
32 | #include <math.h> | 32 | #include <math.h> |
33 | #include <assert.h> | 33 | #include <assert.h> |
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
36 | 36 | ||
37 | // for network handling | ||
38 | #include <netinet/in.h> | ||
39 | #include <netdb.h> | ||
40 | #include <sys/socket.h> | ||
41 | #include <arpa/inet.h> | ||
42 | #include <unistd.h> | ||
43 | |||
44 | |||
37 | //#define HAVE_MMAP | 45 | //#define HAVE_MMAP |
38 | 46 | ||
39 | #if defined(HAVE_MMAP) | 47 | #if defined(HAVE_MMAP) |
40 | # include <sys/mman.h> | 48 | # include <sys/mman.h> |
41 | #endif | 49 | #endif |
42 | #include "libmadplugin.h" | 50 | #include "libmadplugin.h" |
43 | 51 | ||
44 | 52 | ||
45 | extern "C" { | 53 | extern "C" { |
46 | #include "mad.h" | 54 | #include "mad.h" |
47 | } | 55 | } |
48 | 56 | ||
49 | 57 | ||
50 | #define MPEG_BUFFER_SIZE 65536 | 58 | #define MPEG_BUFFER_SIZE 65536 |
51 | //#define MPEG_BUFFER_SIZE 32768 //16384 // 8192 | 59 | //#define MPEG_BUFFER_SIZE 32768 //16384 // 8192 |
52 | //#define debugMsg(a) qDebug(a) | 60 | //#define debugMsg(a) qDebug(a) |
53 | #define debugMsg(a) | 61 | #define debugMsg(a) |
54 | 62 | ||
55 | 63 | ||
56 | class Input { | 64 | class Input { |
57 | public: | 65 | public: |
58 | char const *path; | 66 | char const *path; |
59 | int fd; | 67 | int fd; |
60 | #if defined(HAVE_MMAP) | 68 | #if defined(HAVE_MMAP) |
61 | void *fdm; | 69 | void *fdm; |
62 | #endif | 70 | #endif |
63 | unsigned char *data; | 71 | unsigned char *data; |
64 | unsigned long length; | 72 | unsigned long length; |
65 | int eof; | 73 | int eof; |
66 | }; | 74 | }; |
67 | 75 | ||
68 | 76 | ||
@@ -131,83 +139,258 @@ LibMadPlugin::LibMadPlugin() { | |||
131 | #if defined(HAVE_MMAP) | 139 | #if defined(HAVE_MMAP) |
132 | d->input.fdm = 0; | 140 | d->input.fdm = 0; |
133 | #endif | 141 | #endif |
134 | d->input.data = 0; | 142 | d->input.data = 0; |
135 | d->flush = TRUE; | 143 | d->flush = TRUE; |
136 | info = tr( "No Song Open" ); | 144 | info = tr( "No Song Open" ); |
137 | } | 145 | } |
138 | 146 | ||
139 | 147 | ||
140 | LibMadPlugin::~LibMadPlugin() { | 148 | LibMadPlugin::~LibMadPlugin() { |
141 | close(); | 149 | close(); |
142 | delete d; | 150 | delete d; |
143 | } | 151 | } |
144 | 152 | ||
145 | 153 | ||
146 | bool LibMadPlugin::isFileSupported( const QString& path ) { | 154 | bool LibMadPlugin::isFileSupported( const QString& path ) { |
147 | debugMsg( "LibMadPlugin::isFileSupported" ); | 155 | debugMsg( "LibMadPlugin::isFileSupported" ); |
148 | 156 | ||
149 | // Mpeg file extensions | 157 | // Mpeg file extensions |
150 | // "mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3" | 158 | // "mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3" |
151 | // Other media extensions | 159 | // Other media extensions |
152 | // "wav","mid","mod","s3m","ogg","avi","mov","sid" | 160 | // "wav","mid","mod","s3m","ogg","avi","mov","sid" |
153 | 161 | ||
154 | char *ext = strrchr( path.latin1(), '.' ); | 162 | char *ext = strrchr( path.latin1(), '.' ); |
155 | 163 | ||
156 | // Test file extension | 164 | // Test file extension |
157 | if ( ext ) { | 165 | if ( ext ) { |
158 | if ( strncasecmp(ext, ".mp2", 4) == 0 ) | 166 | if ( strncasecmp(ext, ".mp2", 4) == 0 ) |
159 | return TRUE; | 167 | return TRUE; |
160 | if ( strncasecmp(ext, ".mp3", 4) == 0 ) | 168 | if ( strncasecmp(ext, ".mp3", 4) == 0 ) |
161 | return TRUE; | 169 | return TRUE; |
162 | } | 170 | } |
171 | // UGLY - just for fast testing | ||
172 | if ( path.left(4) == "http") { | ||
173 | return TRUE; | ||
174 | } | ||
175 | |||
163 | 176 | ||
164 | return FALSE; | 177 | return FALSE; |
165 | } | 178 | } |
166 | 179 | ||
167 | 180 | ||
181 | int LibMadPlugin::tcp_open(char *address, int port) { | ||
182 | struct sockaddr_in stAddr; | ||
183 | struct hostent *host; | ||
184 | int sock; | ||
185 | struct linger l; | ||
186 | |||
187 | memset(&stAddr, 0, sizeof(stAddr)); | ||
188 | stAddr.sin_family = AF_INET; | ||
189 | stAddr.sin_port = htons(port); | ||
190 | |||
191 | if ((host = gethostbyname(address)) == NULL) | ||
192 | return (0); | ||
193 | |||
194 | stAddr.sin_addr = *((struct in_addr *)host->h_addr_list[0]); | ||
195 | |||
196 | if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) | ||
197 | return (0); | ||
198 | |||
199 | l.l_onoff = 1; | ||
200 | l.l_linger = 5; | ||
201 | if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l)) < 0) | ||
202 | return (0); | ||
203 | |||
204 | if (connect(sock, (struct sockaddr *)&stAddr, sizeof(stAddr)) < 0) | ||
205 | return (0); | ||
206 | |||
207 | return (sock); | ||
208 | } | ||
209 | |||
210 | |||
211 | /** | ||
212 | * Read a http line header. | ||
213 | * This function read character by character. | ||
214 | * @param tcp_sock the socket use to read the stream | ||
215 | * @param buf a buffer to receive the data | ||
216 | * @param size size of the buffer | ||
217 | * @return the size of the stream read or -1 if an error occured | ||
218 | */ | ||
219 | int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { | ||
220 | int offset = 0; | ||
221 | |||
222 | do | ||
223 | { | ||
224 | if (std::read(tcp_sock, buf + offset, 1) < 0) | ||
225 | return -1; | ||
226 | if (buf[offset] != '\r') /* Strip \r from answer */ | ||
227 | offset++; | ||
228 | } | ||
229 | while (offset < size - 1 && buf[offset - 1] != '\n'); | ||
230 | |||
231 | buf[offset] = 0; | ||
232 | return offset; | ||
233 | } | ||
234 | |||
235 | int LibMadPlugin::http_open(const QString& path ) { | ||
236 | char *host; | ||
237 | int port; | ||
238 | char *request; | ||
239 | int tcp_sock; | ||
240 | char http_request[PATH_MAX]; | ||
241 | char filename[PATH_MAX]; | ||
242 | char c; | ||
243 | char *arg =strdup(path.latin1()); | ||
244 | |||
245 | /* Check for URL syntax */ | ||
246 | if (strncmp(arg, "http://", strlen("http://"))) | ||
247 | return (0); | ||
248 | |||
249 | /* Parse URL */ | ||
250 | port = 80; | ||
251 | host = arg + strlen("http://"); | ||
252 | if ((request = strchr(host, '/')) == NULL) | ||
253 | return (0); | ||
254 | *request++ = 0; | ||
255 | |||
256 | if (strchr(host, ':') != NULL) /* port is specified */ | ||
257 | { | ||
258 | port = atoi(strchr(host, ':') + 1); | ||
259 | *strchr(host, ':') = 0; | ||
260 | } | ||
261 | |||
262 | /* Open a TCP socket */ | ||
263 | if (!(tcp_sock = tcp_open(host, port))) | ||
264 | { | ||
265 | perror("http_open"); | ||
266 | return (0); | ||
267 | } | ||
268 | |||
269 | snprintf(filename, sizeof(filename) - strlen(host) - 75, "%s", request); | ||
270 | |||
271 | /* Send HTTP GET request */ | ||
272 | /* Please don't use a Agent know by shoutcast (Lynx, Mozilla) seems to be reconized and print | ||
273 | * a html page and not the stream */ | ||
274 | snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n" | ||
275 | /* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */ | ||
276 | "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host); | ||
277 | |||
278 | send(tcp_sock, http_request, strlen(http_request), 0); | ||
279 | |||
280 | /* Parse server reply */ | ||
281 | #if 0 | ||
282 | do | ||
283 | read(tcp_sock, &c, sizeof(char)); | ||
284 | while (c != ' '); | ||
285 | read(tcp_sock, http_request, 4 * sizeof(char)); | ||
286 | http_request[4] = 0; | ||
287 | if (strcmp(http_request, "200 ")) | ||
288 | { | ||
289 | fprintf(stderr, "http_open: "); | ||
290 | do | ||
291 | { | ||
292 | read(tcp_sock, &c, sizeof(char)); | ||
293 | fprintf(stderr, "%c", c); | ||
294 | } | ||
295 | while (c != '\r'); | ||
296 | fprintf(stderr, "\n"); | ||
297 | return (0); | ||
298 | } | ||
299 | #endif | ||
300 | |||
301 | do | ||
302 | { | ||
303 | int len; | ||
304 | |||
305 | len = http_read_line(tcp_sock, http_request, sizeof(http_request)); | ||
306 | |||
307 | if (len == -1) | ||
308 | { | ||
309 | fprintf(stderr, "http_open: %s\n", strerror(errno)); | ||
310 | return 0; | ||
311 | } | ||
312 | |||
313 | if (strncmp(http_request, "Location:", 9) == 0) | ||
314 | { | ||
315 | /* redirect */ | ||
316 | std::close(tcp_sock); | ||
317 | |||
318 | http_request[strlen(http_request) - 1] = '\0'; | ||
319 | |||
320 | return http_open(&http_request[10]); | ||
321 | } | ||
322 | |||
323 | if (strncmp(http_request, "ICY ", 4) == 0) | ||
324 | { | ||
325 | /* This is icecast streaming */ | ||
326 | if (strncmp(http_request + 4, "200 ", 4)) | ||
327 | { | ||
328 | fprintf(stderr, "http_open: %s\n", http_request); | ||
329 | return 0; | ||
330 | } | ||
331 | } | ||
332 | else if (strncmp(http_request, "icy-", 4) == 0) | ||
333 | { | ||
334 | /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */ | ||
335 | /* Don't print these - mpg123 doesn't */ | ||
336 | /* fprintf(stderr,"%s\n",http_request); */ | ||
337 | } | ||
338 | } | ||
339 | while (strcmp(http_request, "\n") != 0); | ||
340 | |||
341 | return (tcp_sock); | ||
342 | } | ||
343 | |||
344 | |||
168 | bool LibMadPlugin::open( const QString& path ) { | 345 | bool LibMadPlugin::open( const QString& path ) { |
169 | debugMsg( "LibMadPlugin::open" ); | 346 | debugMsg( "LibMadPlugin::open" ); |
170 | Config cfg("MediaPlayer"); | 347 | Config cfg("MediaPlayer"); |
171 | cfg.setGroup("Options"); | 348 | cfg.setGroup("Options"); |
172 | bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); | 349 | bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); |
173 | qDebug("buffer size is %d", bufferSize); | 350 | qDebug("buffer size is %d", bufferSize); |
174 | d->bad_last_frame = 0; | 351 | d->bad_last_frame = 0; |
175 | d->flush = TRUE; | 352 | d->flush = TRUE; |
176 | info = QString( "" ); | 353 | info = QString( "" ); |
177 | 354 | ||
178 | //qDebug( "Opening %s", path.latin1() ); | 355 | //qDebug( "Opening %s", path.latin1() ); |
179 | 356 | ||
180 | d->input.path = path.latin1(); | 357 | |
181 | d->input.fd = ::open( d->input.path, O_RDONLY ); | 358 | if (path.left( 4 ) == "http" ) { |
359 | d->input.fd = http_open(path); | ||
360 | |||
361 | } else { | ||
362 | d->input.path = path.latin1(); | ||
363 | d->input.fd = ::open( d->input.path, O_RDONLY ); | ||
364 | } | ||
182 | if (d->input.fd == -1) { | 365 | if (d->input.fd == -1) { |
183 | qDebug("error opening %s", d->input.path ); | 366 | qDebug("error opening %s", d->input.path ); |
184 | return FALSE; | 367 | return FALSE; |
185 | } | 368 | } |
186 | 369 | ||
187 | printID3Tags(); | 370 | printID3Tags(); |
188 | 371 | ||
189 | #if defined(HAVE_MMAP) | 372 | #if defined(HAVE_MMAP) |
190 | struct stat stat; | 373 | struct stat stat; |
191 | if (fstat(d->input.fd, &stat) == -1) { | 374 | if (fstat(d->input.fd, &stat) == -1) { |
192 | qDebug("error calling fstat"); return FALSE; | 375 | qDebug("error calling fstat"); return FALSE; |
193 | } | 376 | } |
194 | if (S_ISREG(stat.st_mode) && stat.st_size > 0) { | 377 | if (S_ISREG(stat.st_mode) && stat.st_size > 0) { |
195 | d->input.length = stat.st_size; | 378 | d->input.length = stat.st_size; |
196 | d->input.fdm = map_file(d->input.fd, &d->input.length); | 379 | d->input.fdm = map_file(d->input.fd, &d->input.length); |
197 | if (d->input.fdm == 0) { | 380 | if (d->input.fdm == 0) { |
198 | qDebug("error mmapping file"); return FALSE; | 381 | qDebug("error mmapping file"); return FALSE; |
199 | } | 382 | } |
200 | d->input.data = (unsigned char *)d->input.fdm; | 383 | d->input.data = (unsigned char *)d->input.fdm; |
201 | } | 384 | } |
202 | #endif | 385 | #endif |
203 | 386 | ||
204 | if (d->input.data == 0) { | 387 | if (d->input.data == 0) { |
205 | d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/); | 388 | d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/); |
206 | if (d->input.data == 0) { | 389 | if (d->input.data == 0) { |
207 | qDebug("error allocating input buffer"); | 390 | qDebug("error allocating input buffer"); |
208 | return FALSE; | 391 | return FALSE; |
209 | } | 392 | } |
210 | d->input.length = 0; | 393 | d->input.length = 0; |
211 | } | 394 | } |
212 | 395 | ||
213 | d->input.eof = 0; | 396 | d->input.eof = 0; |
@@ -467,65 +650,65 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) { | |||
467 | memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) ); | 650 | memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) ); |
468 | if ( d->synth.pcm.channels == 2 ) | 651 | if ( d->synth.pcm.channels == 2 ) |
469 | memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) ); | 652 | memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) ); |
470 | offset += decodedSamples; | 653 | offset += decodedSamples; |
471 | buffered += decodedSamples; | 654 | buffered += decodedSamples; |
472 | } | 655 | } |
473 | //qApp->processEvents(); | 656 | //qApp->processEvents(); |
474 | audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 ); | 657 | audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 ); |
475 | // audio_pcm( output, samples, buffer[1], buffer[0] ); | 658 | // audio_pcm( output, samples, buffer[1], buffer[0] ); |
476 | // audio_pcm( output, samples, buffer[0], buffer[1] ); | 659 | // audio_pcm( output, samples, buffer[0], buffer[1] ); |
477 | samplesMade = samples; | 660 | samplesMade = samples; |
478 | memmove( buffer[0], &(buffer[0][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); | 661 | memmove( buffer[0], &(buffer[0][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); |
479 | if ( d->synth.pcm.channels == 2 ) | 662 | if ( d->synth.pcm.channels == 2 ) |
480 | memmove( buffer[1], &(buffer[1][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); | 663 | memmove( buffer[1], &(buffer[1][samples]), (buffered - samples) * sizeof(mad_fixed_t) ); |
481 | buffered -= samples; | 664 | buffered -= samples; |
482 | 665 | ||
483 | return TRUE; | 666 | return TRUE; |
484 | } | 667 | } |
485 | 668 | ||
486 | /* | 669 | /* |
487 | bool LibMadPlugin::audioReadMonoSamples( short *, long, long&, int ) { | 670 | bool LibMadPlugin::audioReadMonoSamples( short *, long, long&, int ) { |
488 | debugMsg( "LibMadPlugin::audioReadMonoSamples" ); | 671 | debugMsg( "LibMadPlugin::audioReadMonoSamples" ); |
489 | return FALSE; | 672 | return FALSE; |
490 | } | 673 | } |
491 | 674 | ||
492 | 675 | ||
493 | bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { | 676 | bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { |
494 | */ | 677 | */ |
495 | bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long samples, long& samplesMade, int ) { | 678 | bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long samples, long& samplesMade, int ) { |
496 | debugMsg( "LibMadPlugin::audioReadStereoSamples" ); | 679 | debugMsg( "LibMadPlugin::audioReadStereoSamples" ); |
497 | 680 | ||
498 | static bool needInput = TRUE; | 681 | static bool needInput = TRUE; |
499 | 682 | ||
500 | if ( samples == 0 ) | 683 | if ( samples == 0 ) |
501 | return FALSE; | 684 | return FALSE; |
502 | 685 | ||
503 | do { | 686 | do { |
504 | if ( needInput ) | 687 | if ( needInput ) |
505 | if ( !read() ) { | 688 | if ( !read() ) { |
506 | // if ( d->input.eof ) | 689 | // if ( d->input.eof ) |
507 | // needInput = FALSE; | 690 | // needInput = FALSE; |
508 | // else | 691 | // else |
509 | return FALSE; | 692 | return FALSE; |
510 | } | 693 | } |
511 | 694 | ||
512 | needInput = FALSE; | 695 | needInput = FALSE; |
513 | 696 | ||
514 | if ( decode( output, samples, samplesMade ) ) | 697 | if ( decode( output, samples, samplesMade ) ) |
515 | return TRUE; | 698 | return TRUE; |
516 | else | 699 | else |
517 | needInput = TRUE; | 700 | needInput = TRUE; |
518 | } | 701 | } |
519 | while ( ( samplesMade < samples ) && ( !d->input.eof ) ); | 702 | while ( ( samplesMade < samples ) && ( !d->input.eof ) ); |
520 | /* | 703 | /* |
521 | static bool firstTimeThru = TRUE; | 704 | static bool firstTimeThru = TRUE; |
522 | 705 | ||
523 | if ( firstTimeThru ) { | 706 | if ( firstTimeThru ) { |
524 | firstTimeThru = FALSE; | 707 | firstTimeThru = FALSE; |
525 | decode( output, samples, samplesMade ); | 708 | decode( output, samples, samplesMade ); |
526 | return FALSE; | 709 | return FALSE; |
527 | } else | 710 | } else |
528 | */ | 711 | */ |
529 | return FALSE; | 712 | return FALSE; |
530 | } | 713 | } |
531 | 714 | ||
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h index 46cd4a1..ee1ca9d 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.h +++ b/core/multimedia/opieplayer/libmad/libmadplugin.h | |||
@@ -1,110 +1,115 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMAD_PLUGIN_H | 20 | #ifndef LIBMAD_PLUGIN_H |
21 | #define LIBMAD_PLUGIN_H | 21 | #define LIBMAD_PLUGIN_H |
22 | 22 | ||
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | #include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
25 | /* #include "../mediaplayerplugininterface.h" */ | 25 | /* #include "../mediaplayerplugininterface.h" */ |
26 | 26 | ||
27 | 27 | ||
28 | // #define OLD_MEDIAPLAYER_API | 28 | // #define OLD_MEDIAPLAYER_API |
29 | 29 | ||
30 | 30 | ||
31 | class LibMadPluginData; | 31 | class LibMadPluginData; |
32 | 32 | ||
33 | 33 | ||
34 | class LibMadPlugin : public MediaPlayerDecoder { | 34 | class LibMadPlugin : public MediaPlayerDecoder { |
35 | 35 | ||
36 | public: | 36 | public: |
37 | LibMadPlugin(); | 37 | LibMadPlugin(); |
38 | ~LibMadPlugin(); | 38 | ~LibMadPlugin(); |
39 | 39 | ||
40 | const char *pluginName() { return "LibMadPlugin"; } | 40 | const char *pluginName() { return "LibMadPlugin"; } |
41 | const char *pluginComment() { return "This is the libmad library that has been wrapped as a plugin"; } | 41 | const char *pluginComment() { return "This is the libmad library that has been wrapped as a plugin"; } |
42 | double pluginVersion() { return 1.0; } | 42 | double pluginVersion() { return 1.0; } |
43 | 43 | ||
44 | bool isFileSupported( const QString& ); | 44 | bool isFileSupported( const QString& ); |
45 | bool open( const QString& ); | 45 | bool open( const QString& ); |
46 | |||
46 | bool close(); | 47 | bool close(); |
47 | bool isOpen(); | 48 | bool isOpen(); |
48 | const QString &fileInfo() { return info; } | 49 | const QString &fileInfo() { return info; } |
49 | 50 | ||
50 | // If decoder doesn't support audio then return 0 here | 51 | // If decoder doesn't support audio then return 0 here |
51 | int audioStreams(); | 52 | int audioStreams(); |
52 | int audioChannels( int stream ); | 53 | int audioChannels( int stream ); |
53 | int audioFrequency( int stream ); | 54 | int audioFrequency( int stream ); |
54 | int audioSamples( int stream ); | 55 | int audioSamples( int stream ); |
55 | bool audioSetSample( long sample, int stream ); | 56 | bool audioSetSample( long sample, int stream ); |
56 | /* int audioBitsPerSample(int) {return 0;} */ | 57 | /* int audioBitsPerSample(int) {return 0;} */ |
57 | long audioGetSample( int stream ); | 58 | long audioGetSample( int stream ); |
58 | #ifdef OLD_MEDIAPLAYER_API | 59 | #ifdef OLD_MEDIAPLAYER_API |
59 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
60 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
62 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
63 | #else | 64 | #else |
64 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
65 | #endif | 66 | #endif |
66 | 67 | ||
67 | 68 | ||
68 | bool read(); | 69 | bool read(); |
69 | bool decode( short *output, long samples, long& samplesRead ); | 70 | bool decode( short *output, long samples, long& samplesRead ); |
70 | void printID3Tags(); | 71 | void printID3Tags(); |
71 | 72 | ||
72 | 73 | ||
73 | // If decoder doesn't support video then return 0 here | 74 | // If decoder doesn't support video then return 0 here |
74 | int videoStreams() { return 0; } | 75 | int videoStreams() { return 0; } |
75 | int videoWidth( int ) { return 0; } | 76 | int videoWidth( int ) { return 0; } |
76 | int videoHeight( int ) { return 0; } | 77 | int videoHeight( int ) { return 0; } |
77 | double videoFrameRate( int ) { return 0.0; } | 78 | double videoFrameRate( int ) { return 0.0; } |
78 | int videoFrames( int ) { return 0; } | 79 | int videoFrames( int ) { return 0; } |
79 | bool videoSetFrame( long, int ) { return FALSE; } | 80 | bool videoSetFrame( long, int ) { return FALSE; } |
80 | long videoGetFrame( int ) { return 0; } | 81 | long videoGetFrame( int ) { return 0; } |
81 | bool videoReadFrame( unsigned char **, int, int, int, int, ColorFormat, int ) { return FALSE; } | 82 | bool videoReadFrame( unsigned char **, int, int, int, int, ColorFormat, int ) { return FALSE; } |
82 | bool videoReadScaledFrame( unsigned char **, int, int, int, int, int, int, ColorFormat, int ) { return FALSE; } | 83 | bool videoReadScaledFrame( unsigned char **, int, int, int, int, int, int, ColorFormat, int ) { return FALSE; } |
83 | bool videoReadYUVFrame( char *, char *, char *, int, int, int, int, int ) { return FALSE; } | 84 | bool videoReadYUVFrame( char *, char *, char *, int, int, int, int, int ) { return FALSE; } |
84 | 85 | ||
85 | // Profiling | 86 | // Profiling |
86 | double getTime(); | 87 | double getTime(); |
87 | 88 | ||
88 | // Ignore if these aren't supported | 89 | // Ignore if these aren't supported |
89 | bool setSMP( int ) { return FALSE; } | 90 | bool setSMP( int ) { return FALSE; } |
90 | bool setMMX( bool ) { return FALSE; } | 91 | bool setMMX( bool ) { return FALSE; } |
91 | 92 | ||
92 | // Capabilities | 93 | // Capabilities |
93 | bool supportsAudio() { return TRUE; } | 94 | bool supportsAudio() { return TRUE; } |
94 | bool supportsVideo() { return FALSE; } | 95 | bool supportsVideo() { return FALSE; } |
95 | bool supportsYUV() { return FALSE; } | 96 | bool supportsYUV() { return FALSE; } |
96 | bool supportsMMX() { return TRUE; } | 97 | bool supportsMMX() { return TRUE; } |
97 | bool supportsSMP() { return FALSE; } | 98 | bool supportsSMP() { return FALSE; } |
98 | bool supportsStereo() { return TRUE; } | 99 | bool supportsStereo() { return TRUE; } |
99 | bool supportsScaling() { return FALSE; } | 100 | bool supportsScaling() { return FALSE; } |
100 | 101 | ||
101 | long getPlayTime() { return -1; } | 102 | long getPlayTime() { return -1; } |
102 | 103 | ||
103 | private: | 104 | private: |
105 | int tcp_open(char *address, int port); | ||
106 | int http_read_line(int tcp_sock, char *buf, int size) ; | ||
107 | int http_open(const QString& path ); | ||
108 | |||
104 | LibMadPluginData *d; | 109 | LibMadPluginData *d; |
105 | QString info; | 110 | QString info; |
106 | int bufferSize; | 111 | int bufferSize; |
107 | }; | 112 | }; |
108 | 113 | ||
109 | 114 | ||
110 | #endif | 115 | #endif |