libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Playbook) Some build fixes/take out some BB10-specific defines

Browse Source
This commit is contained in:
twinaphex 2014-05-25 23:09:24 +02:00
parent 1c9d7fa261
commit ea5fb7b711
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blackberry-qnx/alsa_qsa.c
View File

@ -153,9 +153,7 @@ static void *alsa_qsa_init(const char *device, unsigned rate, unsigned latency)
alsa->buffer[i] = alsa->buffer_chunk + i * alsa->buf_size; alsa->buffer[i] = alsa->buffer_chunk + i * alsa->buf_size;
alsa->has_float = false; alsa->has_float = false;
#ifdef HAVE_BB10
alsa->can_pause = true; alsa->can_pause = true;
#endif
RARCH_LOG("[ALSA QSA]: Can pause: %s.\n", alsa->can_pause ? "yes" : "no"); RARCH_LOG("[ALSA QSA]: Can pause: %s.\n", alsa->can_pause ? "yes" : "no");
return alsa; return alsa;
@ -282,11 +280,7 @@ static bool alsa_qsa_stop(void *data)
if (alsa->can_pause && !alsa->is_paused) if (alsa->can_pause && !alsa->is_paused)
{ {
#ifdef HAVE_BB10
if (snd_pcm_playback_pause(alsa->pcm) == 0) if (snd_pcm_playback_pause(alsa->pcm) == 0)
#else
if (snd_pcm_channel_flush(alsa->pcm, SND_PCM_CHANNEL_PLAYBACK) == 0)
#endif
{ {
alsa->is_paused = true; alsa->is_paused = true;
return true; return true;
@ -320,11 +314,7 @@ static bool alsa_qsa_start(void *data)
if (alsa->can_pause && alsa->is_paused) if (alsa->can_pause && alsa->is_paused)
{ {
#ifdef HAVE_BB10
int ret = snd_pcm_playback_resume(alsa->pcm); int ret = snd_pcm_playback_resume(alsa->pcm);
#else
int ret = 0;
#endif
if (ret < 0) if (ret < 0)
{ {
RARCH_ERR("[ALSA QSA]: Failed to unpause: %s.\n", snd_strerror(ret)); RARCH_ERR("[ALSA QSA]: Failed to unpause: %s.\n", snd_strerror(ret));

14
blackberry-qnx/playbook/.cproject
View File

@ -33,6 +33,7 @@
<listOptionValue builtIn="false" value="HAVE_DYLIB"/> <listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/> <listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC_RESAMPLER"/> <listOptionValue builtIn="false" value="HAVE_CC_RESAMPLER"/>
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/> <listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_MENU"/> <listOptionValue builtIn="false" value="HAVE_MENU"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/> <listOptionValue builtIn="false" value="HAVE_NEON"/>
@ -156,7 +157,8 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/> <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/> <listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/> <listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/> <listOptionValue builtIn="false" value="HAVE_CC_RESAMPLER"/>
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/> <listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_MENU"/> <listOptionValue builtIn="false" value="HAVE_MENU"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/> <listOptionValue builtIn="false" value="HAVE_NEON"/>
@ -282,7 +284,8 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/> <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/> <listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/> <listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/> <listOptionValue builtIn="false" value="HAVE_CC_RESAMPLER"/>
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/> <listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_MENU"/> <listOptionValue builtIn="false" value="HAVE_MENU"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/> <listOptionValue builtIn="false" value="HAVE_NEON"/>
@ -403,7 +406,8 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/> <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/> <listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/> <listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/> <listOptionValue builtIn="false" value="HAVE_CC_RESAMPLER"/>
<listOptionValue builtIn="false" value="HAVE_ALSA"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/> <listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_MENU"/> <listOptionValue builtIn="false" value="HAVE_MENU"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/> <listOptionValue builtIn="false" value="HAVE_NEON"/>
@ -519,10 +523,10 @@
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.1511241566"> <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.1511241566">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.release.237026123"> <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.511003583">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.profile.coverage.511003583"> <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.exe.release.237026123">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </storageModule>

2
blackberry-qnx/playbook/.project
View File

@ -27,7 +27,7 @@
</dictionary> </dictionary>
<dictionary> <dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key> <key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/RetroArch/Device-Debug}</value> <value>${workspace_loc:/RetroArch/Device-Release}</value>
</dictionary> </dictionary>
<dictionary> <dictionary>
<key>org.eclipse.cdt.make.core.contents</key> <key>org.eclipse.cdt.make.core.contents</key>