comparison src/audacious/auddrct.c @ 4542:26209b646930

Some cosmetic changes
author mf0102 <0102@gmx.at>
date Mon, 12 May 2008 19:19:49 +0200
parents de1f750f6152
children 084dbc8d23da
comparison
equal deleted inserted replaced
4541:d8920be7275a 4542:26209b646930
35 /* player */ 35 /* player */
36 36
37 void 37 void
38 drct_quit ( void ) 38 drct_quit ( void )
39 { 39 {
40 aud_quit(); 40 aud_quit();
41 } 41 }
42 42
43 void 43 void
44 drct_eject ( void ) 44 drct_eject ( void )
45 { 45 {
46 if (has_x11_connection) 46 if (has_x11_connection)
47 mainwin_eject_pushed(); 47 mainwin_eject_pushed();
48 return; 48 return;
49 } 49 }
50 50
51 void 51 void
52 drct_jtf_show ( void ) 52 drct_jtf_show ( void )
53 { 53 {
54 if (has_x11_connection) 54 if (has_x11_connection)
55 ui_jump_to_track(); 55 ui_jump_to_track();
56 return; 56 return;
57 } 57 }
58 58
59 gboolean 59 gboolean
60 drct_main_win_is_visible ( void ) 60 drct_main_win_is_visible ( void )
61 { 61 {
62 return cfg.player_visible; 62 return cfg.player_visible;
63 } 63 }
64 64
65 void 65 void
66 drct_main_win_toggle ( gboolean show ) 66 drct_main_win_toggle ( gboolean show )
67 { 67 {
68 if (has_x11_connection) 68 if (has_x11_connection)
69 mainwin_show(show); 69 mainwin_show(show);
70 return; 70 return;
71 } 71 }
72 72
73 gboolean 73 gboolean
74 drct_eq_win_is_visible ( void ) 74 drct_eq_win_is_visible ( void )
75 { 75 {
76 return cfg.equalizer_visible; 76 return cfg.equalizer_visible;
77 } 77 }
78 78
79 void 79 void
80 drct_eq_win_toggle ( gboolean show ) 80 drct_eq_win_toggle ( gboolean show )
81 { 81 {
82 if (has_x11_connection) 82 if (has_x11_connection)
83 equalizerwin_show(show); 83 equalizerwin_show(show);
84 return; 84 return;
85 } 85 }
86 86
87 gboolean 87 gboolean
88 drct_pl_win_is_visible ( void ) 88 drct_pl_win_is_visible ( void )
89 { 89 {
90 return cfg.playlist_visible; 90 return cfg.playlist_visible;
91 } 91 }
92 92
93 void 93 void
94 drct_pl_win_toggle ( gboolean show ) 94 drct_pl_win_toggle ( gboolean show )
95 { 95 {
96 if (has_x11_connection) { 96 if (has_x11_connection) {
97 if (show) 97 if (show)
98 playlistwin_show(); 98 playlistwin_show();
99 else
100 playlistwin_hide();
101 }
102 return;
103 }
104
105 void drct_activate(void)
106 {
107 gtk_window_present(GTK_WINDOW(mainwin));
108 }
109
110 /* playback */
111
112 void
113 drct_play ( void )
114 {
115 if (playback_get_paused())
116 playback_pause();
117 else if (playlist_get_length(playlist_get_active()))
118 event_queue("playback initiate", (gpointer)0xdeadbeef); // to avoid crash at startup. --yaz
99 else 119 else
100 playlistwin_hide(); 120 mainwin_eject_pushed();
101 } 121 return;
102 return; 122 }
103 } 123
104 124 void
105 void drct_activate(void) 125 drct_pause ( void )
106 { 126 {
107 gtk_window_present(GTK_WINDOW(mainwin));
108 }
109
110 /* playback */
111
112 void
113 drct_play ( void )
114 {
115 if (playback_get_paused())
116 playback_pause(); 127 playback_pause();
117 else if (playlist_get_length(playlist_get_active())) 128 return;
118 event_queue("playback initiate", (gpointer)0xdeadbeef); // to avoid crash at startup. --yaz
119 else
120 mainwin_eject_pushed();
121 return;
122 }
123
124 void
125 drct_pause ( void )
126 {
127 playback_pause();
128 return;
129 } 129 }
130 130
131 void 131 void
132 drct_stop ( void ) 132 drct_stop ( void )
133 { 133 {
134 ip_data.stop = TRUE; 134 ip_data.stop = TRUE;
135 playback_stop(); 135 playback_stop();
136 ip_data.stop = FALSE; 136 ip_data.stop = FALSE;
137 mainwin_clear_song_info(); 137 mainwin_clear_song_info();
138 return; 138 return;
139 } 139 }
140 140
141 gboolean 141 gboolean
142 drct_get_playing ( void ) 142 drct_get_playing ( void )
143 { 143 {
144 return playback_get_playing(); 144 return playback_get_playing();
145 } 145 }
146 146
147 gboolean 147 gboolean
148 drct_get_paused ( void ) 148 drct_get_paused ( void )
149 { 149 {
150 return playback_get_paused(); 150 return playback_get_paused();
151 } 151 }
152 152
153 gboolean 153 gboolean
154 drct_get_stopped ( void ) 154 drct_get_stopped ( void )
155 { 155 {
156 return !playback_get_playing(); 156 return !playback_get_playing();
157 } 157 }
158 158
159 void 159 void
160 drct_get_info( gint *rate, gint *freq, gint *nch) 160 drct_get_info( gint *rate, gint *freq, gint *nch)
161 { 161 {
163 } 163 }
164 164
165 gint 165 gint
166 drct_get_time ( void ) 166 drct_get_time ( void )
167 { 167 {
168 gint time; 168 gint time;
169 if (playback_get_playing()) 169 if (playback_get_playing())
170 time = playback_get_time(); 170 time = playback_get_time();
171 else 171 else
172 time = 0; 172 time = 0;
173 return time; 173 return time;
174 } 174 }
175 175
176 void 176 void
177 drct_seek ( guint pos ) 177 drct_seek ( guint pos )
178 { 178 {
179 if (playlist_get_current_length(playlist_get_active()) > 0 && 179 if (playlist_get_current_length(playlist_get_active()) > 0 &&
180 pos < (guint)playlist_get_current_length(playlist_get_active())) 180 pos < (guint)playlist_get_current_length(playlist_get_active()))
181 playback_seek(pos / 1000); 181 playback_seek(pos / 1000);
182 return; 182 return;
183 } 183 }
184 184
185 void 185 void
186 drct_get_volume ( gint *vl, gint *vr ) 186 drct_get_volume ( gint *vl, gint *vr )
187 { 187 {
188 input_get_volume(vl, vr); 188 input_get_volume(vl, vr);
189 return; 189 return;
190 } 190 }
191 191
192 void 192 void
193 drct_set_volume ( gint vl, gint vr ) 193 drct_set_volume ( gint vl, gint vr )
194 { 194 {
195 if (vl > 100) 195 if (vl > 100)
196 vl = 100; 196 vl = 100;
197 if (vr > 100) 197 if (vr > 100)
198 vr = 100; 198 vr = 100;
199 input_set_volume(vl, vr); 199 input_set_volume(vl, vr);
200 return; 200 return;
201 } 201 }
202 202
203 void 203 void
204 drct_get_volume_main( gint *v ) 204 drct_get_volume_main( gint *v )
205 { 205 {
206 gint vl, vr; 206 gint vl, vr;
207 drct_get_volume(&vl, &vr); 207 drct_get_volume(&vl, &vr);
208 *v = (vl > vr) ? vl : vr; 208 *v = (vl > vr) ? vl : vr;
209 return; 209 return;
210 } 210 }
211 211
212 void 212 void
213 drct_set_volume_main ( gint v ) 213 drct_set_volume_main ( gint v )
214 { 214 {
215 gint b, vl, vr; 215 gint b, vl, vr;
216 drct_get_volume_balance(&b); 216 drct_get_volume_balance(&b);
217 if (b < 0) { 217 if (b < 0) {
218 vl = v; 218 vl = v;
219 vr = (v * (100 - abs(b))) / 100; 219 vr = (v * (100 - abs(b))) / 100;
220 } 220 }
221 else if (b > 0) { 221 else if (b > 0) {
222 vl = (v * (100 - b)) / 100; 222 vl = (v * (100 - b)) / 100;
223 vr = v; 223 vr = v;
224 } 224 }
225 else 225 else
226 vl = vr = v; 226 vl = vr = v;
227 drct_set_volume(vl, vr); 227 drct_set_volume(vl, vr);
228 } 228 }
229 229
230 void 230 void
231 drct_get_volume_balance ( gint *b ) 231 drct_get_volume_balance ( gint *b )
232 { 232 {
233 gint vl, vr; 233 gint vl, vr;
234 input_get_volume(&vl, &vr); 234 input_get_volume(&vl, &vr);
235 if (vl < 0 || vr < 0) 235 if (vl < 0 || vr < 0)
236 *b = 0; 236 *b = 0;
237 else if (vl > vr) 237 else if (vl > vr)
238 *b = -100 + ((vr * 100) / vl); 238 *b = -100 + ((vr * 100) / vl);
239 else if (vr > vl) 239 else if (vr > vl)
240 *b = 100 - ((vl * 100) / vr); 240 *b = 100 - ((vl * 100) / vr);
241 else 241 else
242 *b = 0; 242 *b = 0;
243 return; 243 return;
244 } 244 }
245 245
246 void 246 void
247 drct_set_volume_balance ( gint b ) 247 drct_set_volume_balance ( gint b )
248 { 248 {
249 gint v, vl, vr; 249 gint v, vl, vr;
250 if (b < -100) 250 if (b < -100)
251 b = -100; 251 b = -100;
252 if (b > 100) 252 if (b > 100)
253 b = 100; 253 b = 100;
254 drct_get_volume_main(&v); 254 drct_get_volume_main(&v);
255 if (b < 0) { 255 if (b < 0) {
256 vl = v; 256 vl = v;
257 vr = (v * (100 - abs(b))) / 100; 257 vr = (v * (100 - abs(b))) / 100;
258 } 258 }
259 else if (b > 0) { 259 else if (b > 0) {
260 vl = (v * (100 - b)) / 100; 260 vl = (v * (100 - b)) / 100;
261 vr = v; 261 vr = v;
262 } 262 }
263 else 263 else
264 { 264 {
265 vl = v; 265 vl = v;
266 vr = v; 266 vr = v;
267 } 267 }
268 drct_set_volume(vl, vr); 268 drct_set_volume(vl, vr);
269 return; 269 return;
270 } 270 }
271 271
272 272
273 /* playlist */ 273 /* playlist */
274 274
275 void 275 void
276 drct_pl_next ( void ) 276 drct_pl_next ( void )
277 { 277 {
278 playlist_next(playlist_get_active()); 278 playlist_next(playlist_get_active());
279 return; 279 return;
280 } 280 }
281 281
282 void 282 void
283 drct_pl_prev ( void ) 283 drct_pl_prev ( void )
284 { 284 {
285 playlist_prev(playlist_get_active()); 285 playlist_prev(playlist_get_active());
286 return; 286 return;
287 } 287 }
288 288
289 gboolean 289 gboolean
290 drct_pl_repeat_is_enabled( void ) 290 drct_pl_repeat_is_enabled( void )
291 { 291 {
293 } 293 }
294 294
295 void 295 void
296 drct_pl_repeat_toggle( void ) 296 drct_pl_repeat_toggle( void )
297 { 297 {
298 mainwin_repeat_pushed(!cfg.repeat); 298 mainwin_repeat_pushed(!cfg.repeat);
299 return; 299 return;
300 } 300 }
301 301
302 gboolean 302 gboolean
303 drct_pl_repeat_is_shuffled( void ) 303 drct_pl_repeat_is_shuffled( void )
304 { 304 {
306 } 306 }
307 307
308 void 308 void
309 drct_pl_shuffle_toggle( void ) 309 drct_pl_shuffle_toggle( void )
310 { 310 {
311 mainwin_shuffle_pushed(!cfg.shuffle); 311 mainwin_shuffle_pushed(!cfg.shuffle);
312 return; 312 return;
313 } 313 }
314 314
315 gchar * 315 gchar *
316 drct_pl_get_title( gint pos ) 316 drct_pl_get_title( gint pos )
317 { 317 {
337 } 337 }
338 338
339 void 339 void
340 drct_pl_add ( GList * list ) 340 drct_pl_add ( GList * list )
341 { 341 {
342 GList *node = list; 342 GList *node = list;
343 while ( node != NULL ) 343 while ( node != NULL )
344 { 344 {
345 playlist_add_url(playlist_get_active(), (gchar*)node->data); 345 playlist_add_url(playlist_get_active(), (gchar*)node->data);
346 node = g_list_next(node); 346 node = g_list_next(node);
347 } 347 }
348 return; 348 return;
349 } 349 }
350 350
351 void 351 void
352 drct_pl_clear ( void ) 352 drct_pl_clear ( void )
353 { 353 {
354 playlist_clear(playlist_get_active()); 354 playlist_clear(playlist_get_active());
355 mainwin_clear_song_info(); 355 mainwin_clear_song_info();
356 return; 356 return;
357 } 357 }
358 358
359 359
360 /* following functions are not tested yet. be careful. --yaz */ 360 /* following functions are not tested yet. be careful. --yaz */
361 void 361 void