Mercurial > audlegacy
comparison src/audacious/main.c @ 4708:c2886b393206
completely remove skin getting/setting
| author | mf0102 <0102@gmx.at> |
|---|---|
| date | Mon, 07 Jul 2008 23:54:10 +0200 |
| parents | 3a56d2786063 |
| children | 9b9bcf252a10 |
comparison
equal
deleted
inserted
replaced
| 4707:512217ec24cc | 4708:c2886b393206 |
|---|---|
| 57 #include "playback.h" | 57 #include "playback.h" |
| 58 #include "playlist.h" | 58 #include "playlist.h" |
| 59 #include "pluginenum.h" | 59 #include "pluginenum.h" |
| 60 #include "signals.h" | 60 #include "signals.h" |
| 61 #include "legacy/ui_manager.h" | 61 #include "legacy/ui_manager.h" |
| 62 #include "legacy/ui_skin.h" | |
| 63 #include "util.h" | 62 #include "util.h" |
| 64 #include "vfs.h" | 63 #include "vfs.h" |
| 65 | 64 |
| 66 #include "icons-stock.h" | 65 #include "icons-stock.h" |
| 67 #include "images/audacious_player.xpm" | 66 #include "images/audacious_player.xpm" |
| 75 struct _AudCmdLineOpt { | 74 struct _AudCmdLineOpt { |
| 76 gchar **filenames; | 75 gchar **filenames; |
| 77 gint session; | 76 gint session; |
| 78 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box; | 77 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box; |
| 79 gboolean enqueue, mainwin, remote, activate; | 78 gboolean enqueue, mainwin, remote, activate; |
| 80 gboolean load_skins; | |
| 81 gboolean no_log; | 79 gboolean no_log; |
| 82 gboolean enqueue_to_temp; | 80 gboolean enqueue_to_temp; |
| 83 gboolean version; | 81 gboolean version; |
| 84 gchar *previous_session_id; | 82 gchar *previous_session_id; |
| 85 gchar *interface; | 83 gchar *interface; |
| 286 fns = g_list_reverse(fns); | 284 fns = g_list_reverse(fns); |
| 287 | 285 |
| 288 #ifdef USE_DBUS | 286 #ifdef USE_DBUS |
| 289 if (is_running) | 287 if (is_running) |
| 290 { | 288 { |
| 291 if (options.load_skins) | 289 GList *i; |
| 290 | |
| 291 if (options.enqueue_to_temp) | |
| 292 audacious_remote_playlist_enqueue_to_temp(session, filenames[0]); | |
| 293 | |
| 294 if (options.enqueue && options.play) | |
| 295 pos = audacious_remote_get_playlist_length(session); | |
| 296 | |
| 297 if (!options.enqueue) | |
| 292 { | 298 { |
| 293 audacious_remote_set_skin(session, filenames[0]); | 299 audacious_remote_playlist_clear(session); |
| 294 skin_install_skin(filenames[0]); | 300 audacious_remote_stop(session); |
| 295 } | 301 } |
| 296 else | 302 |
| 297 { | 303 for (i = fns; i != NULL; i = i->next) |
| 298 GList *i; | 304 audacious_remote_playlist_add_url_string(session, i->data); |
| 299 | 305 |
| 300 if (options.enqueue_to_temp) | 306 if (options.enqueue && options.play && |
| 301 audacious_remote_playlist_enqueue_to_temp(session, filenames[0]); | 307 audacious_remote_get_playlist_length(session) > pos) |
| 302 | 308 audacious_remote_set_playlist_pos(session, pos); |
| 303 if (options.enqueue && options.play) | 309 |
| 304 pos = audacious_remote_get_playlist_length(session); | 310 if (!options.enqueue) |
| 305 | 311 audacious_remote_play(session); |
| 306 if (!options.enqueue) | |
| 307 { | |
| 308 audacious_remote_playlist_clear(session); | |
| 309 audacious_remote_stop(session); | |
| 310 } | |
| 311 | |
| 312 for (i = fns; i != NULL; i = i->next) | |
| 313 audacious_remote_playlist_add_url_string(session, i->data); | |
| 314 | |
| 315 if (options.enqueue && options.play && | |
| 316 audacious_remote_get_playlist_length(session) > pos) | |
| 317 audacious_remote_set_playlist_pos(session, pos); | |
| 318 | |
| 319 if (!options.enqueue) | |
| 320 audacious_remote_play(session); | |
| 321 } | |
| 322 } | 312 } |
| 323 else /* !is_running */ | 313 else /* !is_running */ |
| 324 #endif | 314 #endif |
| 325 { | 315 { |
| 326 if (options.enqueue_to_temp) | 316 if (options.enqueue_to_temp) |