diff options
| author | Robert Kukla <roolku@rockbox.org> | 2007-10-09 21:28:51 +0000 |
|---|---|---|
| committer | Robert Kukla <roolku@rockbox.org> | 2007-10-09 21:28:51 +0000 |
| commit | a07e93938c04d2fe2720bb032006671433719ea6 (patch) | |
| tree | e2858e92ecd979749940c90a4b85449a49f7ea2b /apps/plugins/mpegplayer/mpegplayer.c | |
| parent | 8a3e141904dfa89b12dd679b3e3c3ab2086b5756 (diff) | |
fix yellow and some house cleaning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15056 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
| -rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 128eb268a6..b5e11980db 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -110,7 +110,6 @@ FPS | 27Mhz | 100Hz | 44.1KHz | 48KHz #include "mpeg_settings.h" #include "video_out.h" #include "../../codecs/libmad/mad.h" -#include "splash.h" PLUGIN_HEADER PLUGIN_IRAM_DECLARE @@ -649,10 +648,12 @@ static int get_next_data( Stream* str, uint8_t type ) rb->splash( HZ*3, "missing packet start code prefix : %X%X at %lX", *p, *(p+2), (long unsigned int)(p-disk_buf_start) ); + /* not 64bit safe DEBUGF("end diff: %X,%X,%X,%X,%X,%X\n",(int)str->curr_packet_end, (int)audio_str.curr_packet_end,(int)video_str.curr_packet_end, (int)disk_buf_start,(int)disk_buf_end,(int)disk_buf_tail); - + */ + str->curr_packet_end = str->curr_packet = NULL; break; } @@ -2035,7 +2036,7 @@ ssize_t seek_PTS( int in_file, int start_time, int accept_button ) if ( accept_button ) { rb->yield(); - if (rb->button_available()) + if (rb->button_queue_count()) return -101; } @@ -2159,6 +2160,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) if (parameter == NULL) { api->splash(HZ*2, "No File"); + return PLUGIN_ERROR; } /* Initialize IRAM - stops audio and voice as well */ |