Rename rarch_console_sound.c to rarch_console_rsound.c

This commit is contained in:
Twinaphex 2012-07-30 00:58:47 +02:00
parent daff4fb27c
commit 9d16bca7c8
5 changed files with 18 additions and 20 deletions

View File

@ -36,7 +36,9 @@ CONSOLE EXTENSIONS
#include "../rarch_console_exec.c"
#endif
#include "../rarch_console_sound.c"
#ifdef HAVE_RSOUND
#include "../rarch_console_rsound.c"
#endif
#ifdef HAVE_CONFIGFILE
#include "../rarch_console_config.c"

View File

@ -46,6 +46,17 @@ enum
MODE_EXIT
};
enum
{
SOUND_MODE_NORMAL,
#ifdef HAVE_RSOUND
SOUND_MODE_RSOUND,
#endif
#ifdef HAVE_HEADSET
SOUND_MODE_HEADSET,
#endif
};
#define MAXIMUM_PATH 512
typedef struct

View File

@ -16,9 +16,8 @@
#include <stdint.h>
#include "rarch_console_sound.h"
#include "rarch_console_rsound.h"
#ifdef HAVE_RSOUND
bool rarch_console_rsound_start(const char *ip)
{
strlcpy(g_settings.audio.driver, "rsound", sizeof(g_settings.audio.driver));
@ -49,4 +48,3 @@ void rarch_console_rsound_stop(void)
init_audio();
}
}
#endif

View File

@ -14,23 +14,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef RARCH_CONSOLE_SOUND_H
#define RARCH_CONSOLE_SOUND_H
#ifndef RARCH_CONSOLE_RSOUND_H
#define RARCH_CONSOLE_RSOUND_H
enum
{
SOUND_MODE_NORMAL,
#ifdef HAVE_RSOUND
SOUND_MODE_RSOUND,
#endif
#ifdef HAVE_HEADSET
SOUND_MODE_HEADSET,
#endif
};
#ifdef HAVE_RSOUND
bool rarch_console_rsound_start(const char *ip);
void rarch_console_rsound_stop(void);
#endif
#endif

View File

@ -31,7 +31,7 @@
#include "../../console/rarch_console_input.h"
#include "../../console/rarch_console_config.h"
#include "../../console/rarch_console_settings.h"
#include "../../console/rarch_console_sound.h"
#include "../../console/rarch_console_rsound.h"
#include "../../console/rarch_console_video.h"
#ifdef HAVE_ZLIB