diff options
Diffstat (limited to 'firmware/settings.c')
-rw-r--r-- | firmware/settings.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/firmware/settings.c b/firmware/settings.c index 03a802b543..d2f72e759f 100644 --- a/firmware/settings.c +++ b/firmware/settings.c | |||
@@ -31,57 +31,57 @@ int persist_all_settings( void ) | |||
31 | { | 31 | { |
32 | if( ! persist_volume_setting() ) | 32 | if( ! persist_volume_setting() ) |
33 | { | 33 | { |
34 | panic( "failed to persist volume setting" ); | 34 | panicf( "failed to persist volume setting" ); |
35 | } | 35 | } |
36 | 36 | ||
37 | if( ! persist_balance_setting() ) | 37 | if( ! persist_balance_setting() ) |
38 | { | 38 | { |
39 | panic( "failed to persist balance setting" ); | 39 | panicf( "failed to persist balance setting" ); |
40 | } | 40 | } |
41 | 41 | ||
42 | if( ! persist_bass_setting() ) | 42 | if( ! persist_bass_setting() ) |
43 | { | 43 | { |
44 | panic( "failed to persist bass setting" ); | 44 | panicf( "failed to persist bass setting" ); |
45 | } | 45 | } |
46 | 46 | ||
47 | if( ! persist_treble_setting() ) | 47 | if( ! persist_treble_setting() ) |
48 | { | 48 | { |
49 | panic( "failed to persist treble setting" ); | 49 | panicf( "failed to persist treble setting" ); |
50 | } | 50 | } |
51 | 51 | ||
52 | if( ! persist_loudness_setting() ) | 52 | if( ! persist_loudness_setting() ) |
53 | { | 53 | { |
54 | panic( "failed to persist loudness setting" ); | 54 | panicf( "failed to persist loudness setting" ); |
55 | } | 55 | } |
56 | 56 | ||
57 | if( ! persist_bass_boost_setting() ) | 57 | if( ! persist_bass_boost_setting() ) |
58 | { | 58 | { |
59 | panic( "failed to persist bass boost setting" ); | 59 | panicf( "failed to persist bass boost setting" ); |
60 | } | 60 | } |
61 | 61 | ||
62 | if( ! persist_contrast_setting() ) | 62 | if( ! persist_contrast_setting() ) |
63 | { | 63 | { |
64 | panic( "failed to persist contrast setting" ); | 64 | panicf( "failed to persist contrast setting" ); |
65 | } | 65 | } |
66 | 66 | ||
67 | if( ! persist_poweroff_setting() ) | 67 | if( ! persist_poweroff_setting() ) |
68 | { | 68 | { |
69 | panic( "failed to persist poweroff setting" ); | 69 | panicf( "failed to persist poweroff setting" ); |
70 | } | 70 | } |
71 | 71 | ||
72 | if( ! persist_backlight_setting() ) | 72 | if( ! persist_backlight_setting() ) |
73 | { | 73 | { |
74 | panic( "failed to persist backlight setting" ); | 74 | panicf( "failed to persist backlight setting" ); |
75 | } | 75 | } |
76 | 76 | ||
77 | if( ! persist_poweroff_setting() ) | 77 | if( ! persist_poweroff_setting() ) |
78 | { | 78 | { |
79 | panic( "failed to persist poweroff setting" ); | 79 | panicf( "failed to persist poweroff setting" ); |
80 | } | 80 | } |
81 | 81 | ||
82 | if( ! persist_resume_setting() ) | 82 | if( ! persist_resume_setting() ) |
83 | { | 83 | { |
84 | panic( "failed to persist resume setting" ); | 84 | panicf( "failed to persist resume setting" ); |
85 | } | 85 | } |
86 | 86 | ||
87 | /* by getting here, we had no problems */ | 87 | /* by getting here, we had no problems */ |
@@ -96,22 +96,22 @@ int persist_all_playlist_info( void ) | |||
96 | { | 96 | { |
97 | if( ! persist_playlist_filename() ) | 97 | if( ! persist_playlist_filename() ) |
98 | { | 98 | { |
99 | panic( "failed to persist playlist filename" ); | 99 | panicf( "failed to persist playlist filename" ); |
100 | } | 100 | } |
101 | 101 | ||
102 | if( ! persist_playlist_indices() ) | 102 | if( ! persist_playlist_indices() ) |
103 | { | 103 | { |
104 | panic( "failed to persist playlist indices" ); | 104 | panicf( "failed to persist playlist indices" ); |
105 | } | 105 | } |
106 | 106 | ||
107 | if( ! persist_playlist_index() ) | 107 | if( ! persist_playlist_index() ) |
108 | { | 108 | { |
109 | panic( "failed to persist playlist index" ); | 109 | panicf( "failed to persist playlist index" ); |
110 | } | 110 | } |
111 | 111 | ||
112 | if( ! persist_resume_track_time() ) | 112 | if( ! persist_resume_track_time() ) |
113 | { | 113 | { |
114 | panic( "failed to persist resume track time" ); | 114 | panicf( "failed to persist resume track time" ); |
115 | } | 115 | } |
116 | 116 | ||
117 | /* by getting here, we had no problems */ | 117 | /* by getting here, we had no problems */ |
@@ -124,7 +124,7 @@ int persist_all_playlist_info( void ) | |||
124 | */ | 124 | */ |
125 | void reload_all_settings( user_settings_t *settings ) | 125 | void reload_all_settings( user_settings_t *settings ) |
126 | { | 126 | { |
127 | debug( "reload_all_settings()\n" ); | 127 | DEBUGF( "reload_all_settings()\n" ); |
128 | 128 | ||
129 | /* this is a TEMP stub version */ | 129 | /* this is a TEMP stub version */ |
130 | 130 | ||
@@ -138,7 +138,7 @@ void reload_all_settings( user_settings_t *settings ) | |||
138 | */ | 138 | */ |
139 | void reset_settings( user_settings_t *settings ) { | 139 | void reset_settings( user_settings_t *settings ) { |
140 | 140 | ||
141 | debug( "reset_settings()\n" ); | 141 | DEBUGF( "reset_settings()\n" ); |
142 | 142 | ||
143 | settings->volume = DEFAULT_VOLUME_SETTING; | 143 | settings->volume = DEFAULT_VOLUME_SETTING; |
144 | settings->balance = DEFAULT_BALANCE_SETTING; | 144 | settings->balance = DEFAULT_BALANCE_SETTING; |
@@ -156,9 +156,9 @@ void reset_settings( user_settings_t *settings ) { | |||
156 | */ | 156 | */ |
157 | void display_current_settings( user_settings_t *settings ) | 157 | void display_current_settings( user_settings_t *settings ) |
158 | { | 158 | { |
159 | debug( "\ndisplay_current_settings()\n" ); | 159 | DEBUGF( "\ndisplay_current_settings()\n" ); |
160 | 160 | ||
161 | debugf( "\nvolume:\t\t%d\nbalance:\t%d\nbass:\t\t%d\ntreble:\t\t%d\nloudness:\t%d\nbass boost:\t%d\n", | 161 | DEBUGF( "\nvolume:\t\t%d\nbalance:\t%d\nbass:\t\t%d\ntreble:\t\t%d\nloudness:\t%d\nbass boost:\t%d\n", |
162 | settings->volume, | 162 | settings->volume, |
163 | settings->balance, | 163 | settings->balance, |
164 | settings->bass, | 164 | settings->bass, |
@@ -166,7 +166,7 @@ void display_current_settings( user_settings_t *settings ) | |||
166 | settings->loudness, | 166 | settings->loudness, |
167 | settings->bass_boost ); | 167 | settings->bass_boost ); |
168 | 168 | ||
169 | debugf( "contrast:\t%d\npoweroff:\t%d\nbacklight:\t%d\n", | 169 | DEBUGF( "contrast:\t%d\npoweroff:\t%d\nbacklight:\t%d\n", |
170 | settings->contrast, | 170 | settings->contrast, |
171 | settings->poweroff, | 171 | settings->poweroff, |
172 | settings->backlight ); | 172 | settings->backlight ); |