devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix yellow and some house cleaning

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15056 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Kukla 2007-10-09 21:28:51 +00:00
parent 8a3e141904
commit a07e93938c
7 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugin.c
View file

@ -518,7 +518,7 @@ static const struct plugin_api rockbox_api = {
talk_disable_menus, talk_disable_menus,
talk_enable_menus, talk_enable_menus,
button_available, button_queue_count,
}; };

2
apps/plugin.h
View file

@ -636,7 +636,7 @@ struct plugin_api {
void (*talk_disable_menus)(void); void (*talk_disable_menus)(void);
void (*talk_enable_menus)(void); void (*talk_enable_menus)(void);
int (*button_available)(void); int (*button_queue_count)(void);
}; };
/* plugin header */ /* plugin header */

1
apps/plugins/lib/configfile.c
View file

@ -191,7 +191,6 @@ int configfile_update_entry(const char* filename, const char* name, int val)
while((line_len = cfg_rb->read_line(fd, buf, 256)) > 0) while((line_len = cfg_rb->read_line(fd, buf, 256)) > 0)
{ {
cfg_rb->settings_parseline(buf, &pname, &pval); cfg_rb->settings_parseline(buf, &pname, &pval);
if(!cfg_rb->strcmp(name, pname)) if(!cfg_rb->strcmp(name, pname))
{ {
found = 1; found = 1;

6
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -110,7 +110,6 @@ FPS | 27Mhz | 100Hz | 44.1KHz | 48KHz
#include "mpeg_settings.h" #include "mpeg_settings.h"
#include "video_out.h" #include "video_out.h"
#include "../../codecs/libmad/mad.h" #include "../../codecs/libmad/mad.h"
#include "splash.h"
PLUGIN_HEADER PLUGIN_HEADER
PLUGIN_IRAM_DECLARE PLUGIN_IRAM_DECLARE
@ -649,9 +648,11 @@ static int get_next_data( Stream* str, uint8_t type )
rb->splash( HZ*3, "missing packet start code prefix : %X%X at %lX", rb->splash( HZ*3, "missing packet start code prefix : %X%X at %lX",
*p, *(p+2), (long unsigned int)(p-disk_buf_start) ); *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, 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)audio_str.curr_packet_end,(int)video_str.curr_packet_end,
(int)disk_buf_start,(int)disk_buf_end,(int)disk_buf_tail); (int)disk_buf_start,(int)disk_buf_end,(int)disk_buf_tail);
*/
str->curr_packet_end = str->curr_packet = NULL; str->curr_packet_end = str->curr_packet = NULL;
break; break;
@ -2035,7 +2036,7 @@ ssize_t seek_PTS( int in_file, int start_time, int accept_button )
if ( accept_button ) if ( accept_button )
{ {
rb->yield(); rb->yield();
if (rb->button_available()) if (rb->button_queue_count())
return -101; return -101;
} }
@ -2159,6 +2160,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
if (parameter == NULL) if (parameter == NULL)
{ {
api->splash(HZ*2, "No File"); api->splash(HZ*2, "No File");
return PLUGIN_ERROR;
} }
/* Initialize IRAM - stops audio and voice as well */ /* Initialize IRAM - stops audio and voice as well */

2
firmware/drivers/button.c
View file

@ -293,7 +293,7 @@ static void button_boost(bool state)
} }
#endif /* HAVE_ADJUSTABLE_CPU_FREQ */ #endif /* HAVE_ADJUSTABLE_CPU_FREQ */
int button_available( void ) int button_queue_count( void )
{ {
return queue_count(&button_queue); return queue_count(&button_queue);
} }

2
firmware/export/button.h
View file

@ -27,7 +27,7 @@
extern struct event_queue button_queue; extern struct event_queue button_queue;
void button_init (void); void button_init (void);
int button_available(void); int button_queue_count(void);
long button_get (bool block); long button_get (bool block);
long button_get_w_tmo(int ticks); long button_get_w_tmo(int ticks);
intptr_t button_get_data(void); intptr_t button_get_data(void);

2
uisimulator/sdl/button.c
View file

@ -736,7 +736,7 @@ void button_event(int key, bool pressed)
/* Again copied from real button.c... */ /* Again copied from real button.c... */
int button_available( void ) int button_queue_count( void )
{ {
return queue_count(&button_queue); return queue_count(&button_queue);
} }