(Filebrowser) Remove duplicate code

This commit is contained in:
Twinaphex 2012-06-18 20:37:17 +02:00
parent 84cf67525a
commit f335ee2dab
3 changed files with 3 additions and 14 deletions

View File

@ -50,16 +50,6 @@ void filebrowser_free(filebrowser_t * filebrowser)
filebrowser->current_dir.ptr = 0; filebrowser->current_dir.ptr = 0;
} }
void filebrowser_reset_start_directory(filebrowser_t * filebrowser, const char * start_dir,
const char * extensions)
{
filebrowser->directory_stack_size = 0;
strlcpy(filebrowser->extensions, extensions, sizeof(filebrowser->extensions));
filebrowser_parse_directory(filebrowser, start_dir, extensions);
}
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path,
bool with_extension) bool with_extension)
{ {

View File

@ -47,7 +47,6 @@ typedef struct
void filebrowser_new(filebrowser_t *filebrowser, const char * start_dir, const char * extensions); void filebrowser_new(filebrowser_t *filebrowser, const char * start_dir, const char * extensions);
void filebrowser_free(filebrowser_t *filebrowser); void filebrowser_free(filebrowser_t *filebrowser);
void filebrowser_reset_start_directory(filebrowser_t * filebrowser, const char * start_dir, const char * extensions);
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension); void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension);
void filebrowser_pop_directory (filebrowser_t * filebrowser); void filebrowser_pop_directory (filebrowser_t * filebrowser);

View File

@ -882,7 +882,7 @@ static void select_file(uint32_t menu_id)
if(IS_TIMER_EXPIRED(gl)) if(IS_TIMER_EXPIRED(gl))
{ {
if (CTRL_START(button_was_pressed)) if (CTRL_START(button_was_pressed))
filebrowser_reset_start_directory(&tmpBrowser, "/", extensions); filebrowser_new(&tmpBrowser, "/", extensions);
if (CTRL_CROSS(button_was_pressed)) if (CTRL_CROSS(button_was_pressed))
{ {
@ -980,7 +980,7 @@ static void select_directory(uint32_t menu_id)
if(IS_TIMER_EXPIRED(gl)) if(IS_TIMER_EXPIRED(gl))
{ {
if (CTRL_START(button_was_pressed)) if (CTRL_START(button_was_pressed))
filebrowser_reset_start_directory(&tmpBrowser, "/","empty"); filebrowser_new(&tmpBrowser, "/","empty");
if (CTRL_SQUARE(button_was_pressed)) if (CTRL_SQUARE(button_was_pressed))
{ {
@ -1912,7 +1912,7 @@ static void select_rom(void)
} }
if (CTRL_START(button_was_pressed)) if (CTRL_START(button_was_pressed))
filebrowser_reset_start_directory(&browser, "/", rarch_console_get_rom_ext()); filebrowser_new(&browser, "/", rarch_console_get_rom_ext());
if (CTRL_CROSS(button_was_pressed)) if (CTRL_CROSS(button_was_pressed))
{ {