ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code deduplication

This commit is contained in:
twinaphex 2015-10-26 08:55:59 +01:00
parent bb10bc06b7
commit aff1bd03de
3 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gfx/video_driver.c
View File

@ -16,13 +16,12 @@
#include <string.h> #include <string.h>
#include <string/string_list.h>
#include "video_thread_wrapper.h" #include "video_thread_wrapper.h"
#include "video_pixel_converter.h" #include "video_pixel_converter.h"
#include "video_monitor.h" #include "video_monitor.h"
#include "../general.h" #include "../general.h"
#include "../performance.h" #include "../performance.h"
#include "../string_list_special.h"
#ifndef MEASURE_FRAME_TIME_SAMPLES_COUNT #ifndef MEASURE_FRAME_TIME_SAMPLES_COUNT
#define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024) #define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024)
@ -152,39 +151,7 @@ const char *video_driver_find_ident(int idx)
**/ **/
const char* config_get_video_driver_options(void) const char* config_get_video_driver_options(void)
{ {
union string_list_elem_attr attr; return string_list_special_new(STRING_LIST_VIDEO_DRIVERS);
unsigned i;
char *options = NULL;
int options_len = 0;
struct string_list *options_l = string_list_new();
attr.i = 0;
if (!options_l)
return NULL;
for (i = 0; video_driver_find_handle(i); i++)
{
const char *opt = video_driver_find_ident(i);
options_len += strlen(opt) + 1;
string_list_append(options_l, opt, attr);
}
options = (char*)calloc(options_len, sizeof(char));
if (!options)
{
string_list_free(options_l);
options_l = NULL;
return NULL;
}
string_list_join_concat(options, options_len, options_l, "|");
string_list_free(options_l);
options_l = NULL;
return options;
} }
void find_video_driver(void) void find_video_driver(void)

11
string_list_special.c
View File

@ -68,7 +68,16 @@ const char *string_list_special_new(enum string_list_type type)
case STRING_LIST_AUDIO_DRIVERS: case STRING_LIST_AUDIO_DRIVERS:
for (i = 0; audio_driver_find_handle(i); i++) for (i = 0; audio_driver_find_handle(i); i++)
{ {
const char *opt = audio_driver_find_ident(i); const char *opt = audio_driver_find_ident(i);
len += strlen(opt) + 1;
string_list_append(s, opt, attr);
}
break;
case STRING_LIST_VIDEO_DRIVERS:
for (i = 0; video_driver_find_handle(i); i++)
{
const char *opt = video_driver_find_ident(i);
len += strlen(opt) + 1; len += strlen(opt) + 1;
string_list_append(s, opt, attr); string_list_append(s, opt, attr);

3
string_list_special.h
View File

@ -21,7 +21,8 @@ enum string_list_type
STRING_LIST_NONE = 0, STRING_LIST_NONE = 0,
STRING_LIST_MENU_DRIVERS, STRING_LIST_MENU_DRIVERS,
STRING_LIST_CAMERA_DRIVERS, STRING_LIST_CAMERA_DRIVERS,
STRING_LIST_AUDIO_DRIVERS STRING_LIST_AUDIO_DRIVERS,
STRING_LIST_VIDEO_DRIVERS
}; };
const char *string_list_special_new(enum string_list_type type); const char *string_list_special_new(enum string_list_type type);