Moved settings.c/h to apps/

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1215 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 14 insertions, 9 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 729b22b..e47a58a 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -24,7 +24,6 @@
 #include "i2c.h"
 #include "debug.h"
 #include "rtc.h"
-#include "settings.h"
 
 #define BACKLIGHT_ON 1
 #define BACKLIGHT_OFF 2
@@ -34,6 +33,7 @@ static char backlight_stack[0x100];
 static struct event_queue backlight_queue;
 
 static int backlight_timer;
+static int backlight_timeout = 5;
 
 void backlight_thread(void)
 {
@@ -45,7 +45,7 @@ void backlight_thread(void)
         switch(ev.id)
         {
             case BACKLIGHT_ON:
-                backlight_timer = HZ*global_settings.backlight;
+                backlight_timer = HZ*backlight_timeout;
                 if(backlight_timer)
                 {
 #ifdef HAVE_RTC
@@ -76,6 +76,12 @@ void backlight_off(void)
     queue_post(&backlight_queue, BACKLIGHT_OFF, NULL);
 }
 
+void backlight_time(int seconds)
+{
+    backlight_timeout = seconds;
+    backlight_on();
+}
+
 void backlight_tick(void)
 {
     if(backlight_timer)
diff --git a/firmware/backlight.h b/firmware/backlight.h
index 2a59800..dca1f21 100644
--- a/firmware/backlight.h
+++ b/firmware/backlight.h
@@ -23,5 +23,6 @@ void backlight_init(void);
 void backlight_on(void);
 void backlight_off(void);
 void backlight_tick(void);
+void backlight_time(int seconds);
 
 #endif
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 31e50ca..8523e7f 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -27,7 +27,6 @@
 #include "thread.h"
 #include "panic.h"
 #include "file.h"
-#include "settings.h"
 #include "id3.h"
 
 #define MPEG_STACK_SIZE 0x2000
@@ -672,7 +671,7 @@ void mpeg_treble(int percent)
 #endif
 }
 
-void mpeg_init(void)
+void mpeg_init(int volume, int bass, int treble)
 {
 #ifdef ARCHOS_RECORDER
     int rc;
@@ -737,8 +736,7 @@ void mpeg_init(void)
     dac_config(0x04); /* DAC on, all else off */
 #endif
     
-    mpeg_bass(DEFAULT_BASS_SETTING);
-    mpeg_treble(DEFAULT_TREBLE_SETTING);
-    mpeg_volume(DEFAULT_VOLUME_SETTING);
-
+    mpeg_bass(bass);
+    mpeg_treble(treble);
+    mpeg_volume(volume);
 }
diff --git a/firmware/mpeg.h b/firmware/mpeg.h
index 063ab3f..908eabc 100644
--- a/firmware/mpeg.h
+++ b/firmware/mpeg.h
@@ -19,7 +19,7 @@
 #ifndef _MPEG_H_
 #define _MPEG_H_
 
-void mpeg_init(void);
+void mpeg_init(int volume, int bass, int treble);
 void mpeg_play(char* trackname);
 void mpeg_stop(void);
 void mpeg_pause(void);