From 072342cdabfe111c8e5197c6ce62112580810e23 Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Fri, 6 Jan 2012 14:12:12 +0100 Subject: [PATCH] (360) Gets to initing audio --- 360/main.c | 10 ++++++++-- 360/xdk360_audio.cpp | 2 +- settings.c | 9 +++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/360/main.c b/360/main.c index 44ab2a8d5d..cc6a8785d3 100644 --- a/360/main.c +++ b/360/main.c @@ -18,18 +18,24 @@ #include #include +#include int ssnes_main(int argc, char *argv[]); #undef main // Temporary, a more sane implementation should go here. + int main(int argc, char *argv[]) { + //for devits only, we will need to mount all partitions for retail + //in a different way + DmMapDevkitDrive(); + char arg1[] = "ssnes"; - char arg2[] = "\\Device\\Harddisk0\\Partition2\\roms\\mario.sfc"; + char arg2[] = "e:\\roms\\mario.sfc"; char arg3[] = "-v"; char arg4[] = "-c"; - char arg5[] = "D:/roms/ssnes.cfg"; + char arg5[] = "e:\\roms\\ssnes.cfg"; char *argv_[] = { arg1, arg2, arg3, arg4, arg5, NULL }; return ssnes_main(sizeof(argv_) / sizeof(argv_[0]) - 1, argv_); } diff --git a/360/xdk360_audio.cpp b/360/xdk360_audio.cpp index 9a81b1bf1d..7c446906a5 100644 --- a/360/xdk360_audio.cpp +++ b/360/xdk360_audio.cpp @@ -221,5 +221,5 @@ const audio_driver_t audio_xdk360 = { xa_set_nonblock_state, xa_free, xa_use_float, - "xdk360_xaudio" + "xdk360" }; diff --git a/settings.c b/settings.c index 97b79f5147..118e952f16 100644 --- a/settings.c +++ b/settings.c @@ -53,6 +53,9 @@ static void set_defaults(void) case VIDEO_XENON360: def_video = "xenon360"; break; + case VIDEO_XDK360: + def_video = "xdk360"; + break; case VIDEO_XVIDEO: def_video = "xvideo"; break; @@ -104,6 +107,9 @@ static void set_defaults(void) case AUDIO_XENON360: def_audio = "xenon360"; break; + case AUDIO_XDK360: + def_audio = "xdk360"; + break; case AUDIO_PS3: def_audio = "ps3"; break; @@ -128,6 +134,9 @@ static void set_defaults(void) case INPUT_XENON360: def_input = "xenon360"; break; + case INPUT_XDK360: + def_input = "xdk360"; + break; case INPUT_WII: def_input = "wii"; break;