diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 21:56:08 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 21:56:08 +0000 |
commit | 4d6374c9236b93e0bd457f99944164fc493d1120 (patch) | |
tree | ff9630fcef66e63c61cc0a74e97f21220e668f75 /apps/plugins/mpegplayer/mpegplayer.c | |
parent | 2c643b9f3e22ee07f7949a5471f726758dc40841 (diff) | |
download | rockbox-4d6374c9236b93e0bd457f99944164fc493d1120.tar.gz rockbox-4d6374c9236b93e0bd457f99944164fc493d1120.zip |
Get rid of the 'center' parameter for splashes. There were only 2 of almost 500 splashes which were not centered.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12807 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 684a491872..f292e3dbb3 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -354,10 +354,10 @@ static void get_next_data( Stream* str ) | |||
354 | } else if ((p[4] & 0xf0) == 0x20) { /* mpeg-1 */ | 354 | } else if ((p[4] & 0xf0) == 0x20) { /* mpeg-1 */ |
355 | p += 12; | 355 | p += 12; |
356 | } else { | 356 | } else { |
357 | rb->splash( 30, true, "Weird Pack header!" ); | 357 | rb->splash( 30, "Weird Pack header!" ); |
358 | p += 5; | 358 | p += 5; |
359 | } | 359 | } |
360 | /*rb->splash( 30, true, "Pack header" );*/ | 360 | /*rb->splash( 30, "Pack header" );*/ |
361 | } | 361 | } |
362 | 362 | ||
363 | /* System header, parse and skip it */ | 363 | /* System header, parse and skip it */ |
@@ -370,14 +370,14 @@ static void get_next_data( Stream* str ) | |||
370 | header_length += *(p++); | 370 | header_length += *(p++); |
371 | 371 | ||
372 | p += header_length; | 372 | p += header_length; |
373 | /*rb->splash( 30, true, "System header" );*/ | 373 | /*rb->splash( 30, "System header" );*/ |
374 | } | 374 | } |
375 | 375 | ||
376 | /* Packet header, parse it */ | 376 | /* Packet header, parse it */ |
377 | if( rb->memcmp (p, packet_start_code_prefix, sizeof (packet_start_code_prefix)) != 0 ) | 377 | if( rb->memcmp (p, packet_start_code_prefix, sizeof (packet_start_code_prefix)) != 0 ) |
378 | { | 378 | { |
379 | /* Problem */ | 379 | /* Problem */ |
380 | //rb->splash( HZ*3, true, "missing packet start code prefix : %X%X at %X", *p, *(p+2), p-disk_buf ); | 380 | //rb->splash( HZ*3, "missing packet start code prefix : %X%X at %X", *p, *(p+2), p-disk_buf ); |
381 | str->curr_packet_end = str->curr_packet = NULL; | 381 | str->curr_packet_end = str->curr_packet = NULL; |
382 | return; | 382 | return; |
383 | //++p; | 383 | //++p; |
@@ -389,7 +389,7 @@ static void get_next_data( Stream* str ) | |||
389 | length = (*(p+4)) << 8; | 389 | length = (*(p+4)) << 8; |
390 | length += *(p+5); | 390 | length += *(p+5); |
391 | 391 | ||
392 | /*rb->splash( 100, true, "Stream : %X", stream );*/ | 392 | /*rb->splash( 100, "Stream : %X", stream );*/ |
393 | if (stream != str->id) | 393 | if (stream != str->id) |
394 | { | 394 | { |
395 | /* End of stream ? */ | 395 | /* End of stream ? */ |
@@ -436,7 +436,7 @@ static void get_next_data( Stream* str ) | |||
436 | length++; | 436 | length++; |
437 | if (length > 23) | 437 | if (length > 23) |
438 | { | 438 | { |
439 | rb->splash( 30, true, "Too much stuffing" ); | 439 | rb->splash( 30, "Too much stuffing" ); |
440 | break; | 440 | break; |
441 | } | 441 | } |
442 | } | 442 | } |
@@ -551,7 +551,7 @@ static void mad_decode(void) | |||
551 | } | 551 | } |
552 | len = audio_str.curr_packet_end - audio_str.curr_packet; | 552 | len = audio_str.curr_packet_end - audio_str.curr_packet; |
553 | if (n + len > mpa_buffer_size) { | 553 | if (n + len > mpa_buffer_size) { |
554 | rb->splash( 30, true, "Audio buffer overflow" ); | 554 | rb->splash( 30, "Audio buffer overflow" ); |
555 | audiostatus=STREAM_DONE; | 555 | audiostatus=STREAM_DONE; |
556 | /* Wait to be killed */ | 556 | /* Wait to be killed */ |
557 | for (;;) { rb->sleep(HZ); } | 557 | for (;;) { rb->sleep(HZ); } |
@@ -898,7 +898,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
898 | 898 | ||
899 | eta = 0; | 899 | eta = 0; |
900 | 900 | ||
901 | rb->splash(0,true,"Buffering..."); | 901 | rb->splash(0, "Buffering..."); |
902 | 902 | ||
903 | disk_buf_end = buffer + rb->read (in_file, buffer, buffer_size); | 903 | disk_buf_end = buffer + rb->read (in_file, buffer, buffer_size); |
904 | disk_buf = buffer; | 904 | disk_buf = buffer; |
@@ -913,7 +913,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
913 | (uint8_t*)video_stack,VIDEO_STACKSIZE,"mpgvideo" IF_PRIO(,PRIORITY_PLAYBACK) | 913 | (uint8_t*)video_stack,VIDEO_STACKSIZE,"mpgvideo" IF_PRIO(,PRIORITY_PLAYBACK) |
914 | IF_COP(, COP, true))) == NULL) | 914 | IF_COP(, COP, true))) == NULL) |
915 | { | 915 | { |
916 | rb->splash(HZ,true,"Cannot create video thread!"); | 916 | rb->splash(HZ, "Cannot create video thread!"); |
917 | return PLUGIN_ERROR; | 917 | return PLUGIN_ERROR; |
918 | } | 918 | } |
919 | 919 | ||
@@ -921,7 +921,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
921 | (uint8_t*)audio_stack,AUDIO_STACKSIZE,"mpgaudio" IF_PRIO(,PRIORITY_PLAYBACK) | 921 | (uint8_t*)audio_stack,AUDIO_STACKSIZE,"mpgaudio" IF_PRIO(,PRIORITY_PLAYBACK) |
922 | IF_COP(, CPU, false))) == NULL) | 922 | IF_COP(, CPU, false))) == NULL) |
923 | { | 923 | { |
924 | rb->splash(HZ,true,"Cannot create audio thread!"); | 924 | rb->splash(HZ, "Cannot create audio thread!"); |
925 | rb->remove_thread(videothread_id); | 925 | rb->remove_thread(videothread_id); |
926 | return PLUGIN_ERROR; | 926 | return PLUGIN_ERROR; |
927 | } | 927 | } |