summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2011-02-08 20:05:25 +0000
committerThomas Jarosch <tomj@simonv.com>2011-02-08 20:05:25 +0000
commit5f037ac015e6d76d030a163753db5ff58cdff49b (patch)
treef5eb7dcdc0e0c3e373227e45061c1d99a14a0819 /apps
parent4d129044390a087b6193b6ce63e035b2550b3ce4 (diff)
downloadrockbox-5f037ac015e6d76d030a163753db5ff58cdff49b.tar.gz
rockbox-5f037ac015e6d76d030a163753db5ff58cdff49b.zip
Initial maemo platform support
Adds Nokia N900, N810 and N800 support. Features: - Introduce maemo specific platform defines - Play audio in silent mode - Stop playback on incoming calls - Battery level readout - Bluetooth headset support - Save CPU by disabling screen updates if the display is off or the app doesn't have input focus - N900: GStreamer audio backend Kudos to kugel for the code review. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29248 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs.c2
-rw-r--r--apps/main.c4
-rw-r--r--apps/misc.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs.c b/apps/codecs.c
index 88478e8566..646d5f289b 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -54,7 +54,7 @@
54#define LOGF_ENABLE 54#define LOGF_ENABLE
55#include "logf.h" 55#include "logf.h"
56 56
57#if (CONFIG_PLATFORM & PLATFORM_SDL) 57#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO))
58#define PREFIX(_x_) sim_ ## _x_ 58#define PREFIX(_x_) sim_ ## _x_
59#else 59#else
60#define PREFIX(_x_) _x_ 60#define PREFIX(_x_) _x_
diff --git a/apps/main.c b/apps/main.c
index 6378833973..3fc48be183 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -125,7 +125,7 @@
125#define MAIN_NORETURN_ATTR 125#define MAIN_NORETURN_ATTR
126#endif 126#endif
127 127
128#if (CONFIG_PLATFORM & PLATFORM_SDL) 128#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO))
129#include "sim_tasks.h" 129#include "sim_tasks.h"
130#include "system-sdl.h" 130#include "system-sdl.h"
131#define HAVE_ARGV_MAIN 131#define HAVE_ARGV_MAIN
@@ -351,7 +351,7 @@ static void init(void)
351 show_logo(); 351 show_logo();
352 button_init(); 352 button_init();
353 backlight_init(); 353 backlight_init();
354#if (CONFIG_PLATFORM & PLATFORM_SDL) 354#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO))
355 sim_tasks_init(); 355 sim_tasks_init();
356#endif 356#endif
357#if (CONFIG_PLATFORM & PLATFORM_ANDROID) 357#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
diff --git a/apps/misc.c b/apps/misc.c
index 94b2de4a3f..a08dac3ebf 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -526,7 +526,7 @@ static void unplug_change(bool inserted)
526 526
527long default_event_handler_ex(long event, void (*callback)(void *), void *parameter) 527long default_event_handler_ex(long event, void (*callback)(void *), void *parameter)
528{ 528{
529#if CONFIG_PLATFORM & PLATFORM_ANDROID 529#if CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)
530 static bool resume = false; 530 static bool resume = false;
531#endif 531#endif
532 532
@@ -619,7 +619,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
619 iap_handlepkt(); 619 iap_handlepkt();
620 return SYS_IAP_HANDLEPKT; 620 return SYS_IAP_HANDLEPKT;
621#endif 621#endif
622#if CONFIG_PLATFORM & PLATFORM_ANDROID 622#if CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)
623 /* stop playback if we receive a call */ 623 /* stop playback if we receive a call */
624 case SYS_CALL_INCOMING: 624 case SYS_CALL_INCOMING:
625 resume = audio_status() == AUDIO_STATUS_PLAY; 625 resume = audio_status() == AUDIO_STATUS_PLAY;