diff options
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 | |||
110 | #include "mpeg_settings.h" | 110 | #include "mpeg_settings.h" |
111 | #include "video_out.h" | 111 | #include "video_out.h" |
112 | #include "../../codecs/libmad/mad.h" | 112 | #include "../../codecs/libmad/mad.h" |
113 | #include "splash.h" | ||
114 | 113 | ||
115 | PLUGIN_HEADER | 114 | PLUGIN_HEADER |
116 | PLUGIN_IRAM_DECLARE | 115 | PLUGIN_IRAM_DECLARE |
@@ -649,10 +648,12 @@ static int get_next_data( Stream* str, uint8_t type ) | |||
649 | rb->splash( HZ*3, "missing packet start code prefix : %X%X at %lX", | 648 | rb->splash( HZ*3, "missing packet start code prefix : %X%X at %lX", |
650 | *p, *(p+2), (long unsigned int)(p-disk_buf_start) ); | 649 | *p, *(p+2), (long unsigned int)(p-disk_buf_start) ); |
651 | 650 | ||
651 | /* not 64bit safe | ||
652 | DEBUGF("end diff: %X,%X,%X,%X,%X,%X\n",(int)str->curr_packet_end, | 652 | DEBUGF("end diff: %X,%X,%X,%X,%X,%X\n",(int)str->curr_packet_end, |
653 | (int)audio_str.curr_packet_end,(int)video_str.curr_packet_end, | 653 | (int)audio_str.curr_packet_end,(int)video_str.curr_packet_end, |
654 | (int)disk_buf_start,(int)disk_buf_end,(int)disk_buf_tail); | 654 | (int)disk_buf_start,(int)disk_buf_end,(int)disk_buf_tail); |
655 | 655 | */ | |
656 | |||
656 | str->curr_packet_end = str->curr_packet = NULL; | 657 | str->curr_packet_end = str->curr_packet = NULL; |
657 | break; | 658 | break; |
658 | } | 659 | } |
@@ -2035,7 +2036,7 @@ ssize_t seek_PTS( int in_file, int start_time, int accept_button ) | |||
2035 | if ( accept_button ) | 2036 | if ( accept_button ) |
2036 | { | 2037 | { |
2037 | rb->yield(); | 2038 | rb->yield(); |
2038 | if (rb->button_available()) | 2039 | if (rb->button_queue_count()) |
2039 | return -101; | 2040 | return -101; |
2040 | } | 2041 | } |
2041 | 2042 | ||
@@ -2159,6 +2160,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2159 | if (parameter == NULL) | 2160 | if (parameter == NULL) |
2160 | { | 2161 | { |
2161 | api->splash(HZ*2, "No File"); | 2162 | api->splash(HZ*2, "No File"); |
2163 | return PLUGIN_ERROR; | ||
2162 | } | 2164 | } |
2163 | 2165 | ||
2164 | /* Initialize IRAM - stops audio and voice as well */ | 2166 | /* Initialize IRAM - stops audio and voice as well */ |