Mercurial > audlegacy
annotate src/audacious/main.c @ 3957:fed07be6b708
every other menu shows on button press..
| author | Tomasz Mon <desowin@gmail.com> |
|---|---|
| date | Fri, 16 Nov 2007 15:20:07 +0100 |
| parents | 6aaf5476b765 |
| children | a575c29cee05 |
| rev | line source |
|---|---|
| 2313 | 1 /* Audacious - Cross-platform multimedia player |
| 2 * Copyright (C) 2005-2007 Audacious development team. | |
| 3 * | |
| 4 * Based on BMP: | |
| 5 * Copyright (C) 2003-2004 BMP development team. | |
| 6 * | |
| 7 * Based on XMMS: | |
| 8 * Copyright (C) 1998-2003 XMMS development team. | |
| 9 * | |
| 10 * This program is free software; you can redistribute it and/or modify | |
| 11 * it under the terms of the GNU General Public License as published by | |
|
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
2973
diff
changeset
|
12 * the Free Software Foundation; under version 3 of the License. |
| 2313 | 13 * |
| 14 * This program is distributed in the hope that it will be useful, | |
| 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 * GNU General Public License for more details. | |
| 18 * | |
| 19 * You should have received a copy of the GNU General Public License | |
|
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
2973
diff
changeset
|
20 * along with this program. If not, see <http://www.gnu.org/licenses>. |
|
3123
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
21 * |
|
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
22 * The Audacious team does not consider modular code linking to |
|
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
23 * Audacious or using our public API to be a derived work. |
| 2313 | 24 */ |
| 25 | |
| 26 #ifdef HAVE_CONFIG_H | |
| 27 # include "config.h" | |
| 28 #endif | |
| 29 | |
| 30 #include "main.h" | |
| 31 | |
| 32 #include <glib.h> | |
| 33 #include <glib/gi18n.h> | |
| 34 #include <glib/gprintf.h> | |
| 35 #include <gdk/gdk.h> | |
| 36 #include <stdlib.h> | |
| 37 #include <string.h> | |
| 38 #include <getopt.h> | |
| 39 #include <ctype.h> | |
| 40 #include <time.h> | |
| 41 | |
| 42 #include <unistd.h> | |
| 43 #include <errno.h> | |
| 44 #include <sys/types.h> | |
| 45 #include <sys/stat.h> | |
| 46 #include <signal.h> | |
| 47 | |
| 48 #include "platform/smartinclude.h" | |
| 49 | |
| 2717 | 50 #include "configdb.h" |
| 2313 | 51 #include "vfs.h" |
| 52 | |
|
2694
c2b82432c1b6
[svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents:
2682
diff
changeset
|
53 #ifdef USE_DBUS |
|
2711
c35913222440
[svn] Initial commit of dbus client library for plugins. Various changes were made to the plugin structure to support dbus.
magma
parents:
2709
diff
changeset
|
54 # include "dbus-service.h" |
| 2785 | 55 # include "audctrl.h" |
|
2694
c2b82432c1b6
[svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents:
2682
diff
changeset
|
56 #endif |
|
c2b82432c1b6
[svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents:
2682
diff
changeset
|
57 |
| 3251 | 58 #include "skin.h" |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
59 #include "auddrct.h" |
| 2313 | 60 #include "dnd.h" |
| 61 #include "effect.h" | |
| 62 #include "ui_equalizer.h" | |
| 63 #include "general.h" | |
| 64 #include "hints.h" | |
| 65 #include "input.h" | |
| 66 #include "logger.h" | |
| 67 #include "ui_main.h" | |
| 68 #include "ui_manager.h" | |
| 69 #include "output.h" | |
| 70 #include "playback.h" | |
| 71 #include "playlist.h" | |
| 72 #include "ui_playlist.h" | |
| 73 #include "ui_preferences.h" | |
| 74 #include "pluginenum.h" | |
| 75 #include "ui_skinselector.h" | |
| 76 #include "util.h" | |
| 77 #include "visualization.h" | |
| 78 #include "build_stamp.h" | |
| 79 #include "ui_fileinfo.h" | |
| 80 #include "signals.h" | |
| 2530 | 81 #include "ui_skinned_window.h" |
| 2313 | 82 |
| 83 #include "icons-csource.h" | |
| 84 #include "icons-stock.h" | |
| 85 #include "images/audacious_player.xpm" | |
| 86 | |
| 2364 | 87 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ |
| 2313 | 88 |
| 89 /* Translatable string for beep.desktop's comment field */ | |
| 90 const gchar *desktop_comment = N_("Audacious"); | |
| 91 | |
| 92 const gchar *application_name = N_("Audacious"); | |
| 93 | |
| 94 | |
| 95 struct _BmpCmdLineOpt { | |
| 2411 | 96 gchar **filenames; |
| 2313 | 97 gint session; |
|
3351
7a4fcf84a34f
Removed the hardcoded Add/Play CD menu entry
Calin Crisan ccrisan@gmail.com
parents:
3346
diff
changeset
|
98 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box; |
| 2313 | 99 gboolean enqueue, mainwin, remote, activate; |
| 100 gboolean load_skins; | |
| 101 gboolean headless; | |
| 102 gboolean no_log; | |
| 103 gboolean enqueue_to_temp; | |
| 2411 | 104 gboolean version; |
| 2313 | 105 gchar *previous_session_id; |
| 106 }; | |
| 107 | |
| 108 typedef struct _BmpCmdLineOpt BmpCmdLineOpt; | |
| 109 | |
| 110 BmpCmdLineOpt options; | |
| 111 | |
| 112 BmpConfig cfg; | |
| 113 | |
| 114 BmpConfig bmp_default_config = { | |
| 115 MAINWIN_DEFAULT_POS_X, /* mainwin x position */ | |
| 116 MAINWIN_DEFAULT_POS_Y, /* mainwin y position */ | |
| 117 EQUALIZER_DEFAULT_POS_X, /* equalizer x position */ | |
| 118 EQUALIZER_DEFAULT_POS_Y, /* equalizer y position */ | |
| 119 PLAYLISTWIN_DEFAULT_POS_X, /* playlistwin x position */ | |
| 120 PLAYLISTWIN_DEFAULT_POS_Y, /* playlistwin y position */ | |
| 121 PLAYLISTWIN_DEFAULT_WIDTH, /* playlistwin width */ | |
| 122 PLAYLISTWIN_DEFAULT_HEIGHT, /* playlistwin height */ | |
| 123 10, /* snap distance */ | |
| 124 FALSE, /* real-time priority */ | |
| 125 FALSE, FALSE, /* shuffle, repeat */ | |
| 126 FALSE, /* UNUSED (double size) */ | |
| 127 TRUE, /* autoscroll */ | |
| 128 TRUE, /* analyzer peaks */ | |
| 129 FALSE, /* equalizer autoload */ | |
| 130 FALSE, /* easy move */ | |
| 131 FALSE, /* equalizer active */ | |
| 132 FALSE, /* playlistwin visible */ | |
| 133 FALSE, /* equalizer visible */ | |
| 134 TRUE, /* player visible */ | |
| 135 FALSE, /* player shaded */ | |
| 136 FALSE, /* playlistwin shaded */ | |
| 137 FALSE, /* equalizer shaded */ | |
| 138 FALSE, /* allow multiple instances */ | |
| 139 TRUE, /* always show cb */ | |
| 140 TRUE, TRUE, TRUE, /* convert '_', %20 and '\' */ | |
| 141 TRUE, /* show numbers in playlist */ | |
| 142 TRUE, /* snap windows */ | |
| 143 TRUE, /* save window positions */ | |
| 144 TRUE, /* dim titlebar */ | |
| 145 FALSE, /* get playlist info on load */ | |
| 146 TRUE, /* get playlist info on demand */ | |
| 147 TRUE, /* UNUSED (equalizer doublesize linked) */ | |
| 148 FALSE, /* sort jump to file */ | |
| 149 FALSE, /* use effect plugins */ | |
| 150 FALSE, /* always on top */ | |
| 151 FALSE, /* sticky */ | |
| 152 FALSE, /* no playlist advance */ | |
| 153 FALSE, /* stop after current song */ | |
| 154 TRUE, /* refresh file list */ | |
| 155 TRUE, /* UNUSED (smooth title scrolling) */ | |
| 156 TRUE, /* use playlist metadata */ | |
|
2662
09b404d61ebd
[svn] - remove the unplayable files dialog. it is more annoying than useful.
nenolod
parents:
2651
diff
changeset
|
157 TRUE, /* deprecated */ |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
158 TRUE, /* warn about windows visibility */ |
| 2313 | 159 FALSE, /* use \ as directory delimiter */ |
| 160 FALSE, /* random skin on play */ | |
| 161 FALSE, /* use fontsets */ | |
| 162 FALSE, /* use X font for mainwin */ | |
| 2364 | 163 TRUE, /* use custom cursors */ |
| 164 TRUE, /* close dialog on open */ | |
| 165 TRUE, /* close dialog on add */ | |
| 2313 | 166 0.0, /* equalizer preamp */ |
|
3229
5e12e740c66c
default value for "enabled discovery plugins" was missing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3216
diff
changeset
|
167 {0.0, 0.0, 0.0, 0.0, 0.0, /* equalizer bands */ |
|
5e12e740c66c
default value for "enabled discovery plugins" was missing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3216
diff
changeset
|
168 0.0, 0.0, 0.0, 0.0, 0.0}, |
| 2313 | 169 NULL, /* skin */ |
| 170 NULL, /* output plugin */ | |
| 171 NULL, /* file selector path */ | |
| 172 NULL, /* playlist path */ | |
| 173 NULL, /* playlist font */ | |
| 174 NULL, /* mainwin font */ | |
| 175 NULL, /* disabled input plugins */ | |
| 176 NULL, /* enabled general plugins */ | |
| 177 NULL, /* enabled visualization plugins */ | |
| 178 NULL, /* enabled effect plugins */ | |
|
3229
5e12e740c66c
default value for "enabled discovery plugins" was missing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3216
diff
changeset
|
179 NULL, /* enabled discovery plugins */ |
| 2313 | 180 NULL, /* equalizer preset default file */ |
| 181 NULL, /* equalizer preset extension */ | |
| 182 NULL, /* URL history */ | |
| 183 0, /* timer mode */ | |
| 184 VIS_ANALYZER, /* visualizer type */ | |
| 185 ANALYZER_NORMAL, /* analyzer mode */ | |
| 186 ANALYZER_BARS, /* analyzer type */ | |
| 187 SCOPE_DOT, /* scope mode */ | |
| 188 VOICEPRINT_NORMAL, /* voiceprint mode */ | |
| 189 VU_SMOOTH, /* VU mode */ | |
| 190 REFRESH_FULL, /* visualizer refresh rate */ | |
| 191 FALLOFF_FAST, /* analyzer fall off rate */ | |
| 192 FALLOFF_SLOW, /* peaks fall off rate */ | |
| 193 0, /* playlist position */ | |
| 194 2, /* pause between songs time */ | |
| 195 FALSE, /* pause between songs */ | |
| 196 FALSE, /* show window decorations */ | |
| 197 8, /* mouse wheel scroll step */ | |
| 198 FALSE, /* playlist transparent */ | |
| 199 2, /* 3rd preset (ARTIST - ALBUM - TITLE) */ | |
| 200 NULL, /* title format */ | |
| 201 FALSE, /* software volume control enabled */ | |
| 202 TRUE, /* UNUSED (XMMS compatibility mode) */ | |
| 203 TRUE, /* extra eq filtering */ | |
| 204 3, /* scroll pl by */ | |
| 205 FALSE, /* resume playback on startup */ | |
| 206 -1, /* resume playback on startup time */ | |
| 2364 | 207 TRUE, /* show seperators in pl */ |
|
3229
5e12e740c66c
default value for "enabled discovery plugins" was missing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3216
diff
changeset
|
208 NULL, /* chardet_detector */ |
|
5e12e740c66c
default value for "enabled discovery plugins" was missing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3216
diff
changeset
|
209 NULL, /* chardet_fallback */ |
|
3443
709cd9c2fa8f
Allocate a 500ms buffer instead of a 3000ms buffer by default.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
210 500, /* audio buffer size */ |
| 2364 | 211 FALSE, /* whether or not to postpone format detection on initial add */ |
| 212 TRUE, /* show filepopup for tuple */ | |
| 213 NULL, /* words identifying covers */ | |
| 214 NULL, /* words that might not show up in cover names */ | |
| 2313 | 215 FALSE, |
| 216 0, | |
| 2364 | 217 NULL, /* default session uri base (non-NULL = custom session uri base) */ |
| 218 150, /* short side length of the picture in the filepopup */ | |
| 219 20, /* delay until the filepopup comes up */ | |
| 220 FALSE, /* use filename.jpg for coverart */ | |
| 221 FALSE, /* use XMMS-style file selection */ | |
| 222 TRUE, /* use extension probing */ | |
| 223 255, 255, 255, /* colorize r, g, b */ | |
| 224 FALSE, /* internal: whether or not to terminate */ | |
| 2405 | 225 TRUE, /* whether show progress bar in filepopup or not */ |
| 2806 | 226 TRUE, /* close jtf dialog on jump */ |
|
3543
6b8c8e051c1b
Add new configuration option: Software Volume Control.
William Pitcock <nenolod@atheme.org>
parents:
3530
diff
changeset
|
227 TRUE, /* use back and forth scroll */ |
|
6b8c8e051c1b
Add new configuration option: Software Volume Control.
William Pitcock <nenolod@atheme.org>
parents:
3530
diff
changeset
|
228 FALSE, /* use software volume control */ |
| 2313 | 229 }; |
| 230 | |
| 231 typedef struct bmp_cfg_boolent_t { | |
| 232 char const *be_vname; | |
| 233 gboolean *be_vloc; | |
| 234 gboolean be_wrt; | |
| 235 } bmp_cfg_boolent; | |
| 236 | |
| 237 typedef struct bmp_cfg_nument_t { | |
| 238 char const *ie_vname; | |
| 239 gint *ie_vloc; | |
| 240 gboolean ie_wrt; | |
| 241 } bmp_cfg_nument; | |
| 242 | |
| 243 typedef struct bmp_cfg_strent_t { | |
| 244 char const *se_vname; | |
| 245 char **se_vloc; | |
| 246 gboolean se_wrt; | |
| 247 } bmp_cfg_strent; | |
| 248 | |
| 249 const gchar *bmp_titlestring_presets[] = { | |
|
3296
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
250 "${title}", |
|
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
251 "${?artist:${artist} - }${title}", |
|
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
252 "${?artist:${artist} - }${?album:${album} - }${title}", |
|
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
253 "${?artist:${artist} - }${?album:${album} - }${?track-number:${track-number}. }${title}", |
|
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
254 "${?artist:${artist} }${?album:[ ${album} ] }${?artist:- }${?track-number:${track-number}. }${title}", |
|
c1f506c2b1d0
new format strings
William Pitcock <nenolod@atheme-project.org>
parents:
3251
diff
changeset
|
255 "${?album:${album} - }${title}" |
| 2313 | 256 }; |
| 257 | |
| 258 const guint n_titlestring_presets = G_N_ELEMENTS(bmp_titlestring_presets); | |
| 259 | |
| 260 const gchar *chardet_detector_presets[] = { | |
| 2364 | 261 "None", |
| 262 "Japanese", | |
| 263 "Taiwanese", | |
| 264 "Chinese", | |
| 265 "Korean", | |
| 266 "Russian", | |
|
3216
e91acf24afbc
Expose new libguess-ng character detectors in preferences.
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
267 "Greek", |
|
e91acf24afbc
Expose new libguess-ng character detectors in preferences.
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
268 "Hebrew", |
|
e91acf24afbc
Expose new libguess-ng character detectors in preferences.
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
269 "Turkish", |
|
e91acf24afbc
Expose new libguess-ng character detectors in preferences.
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
270 "Arabic", |
| 2313 | 271 #ifdef HAVE_UDET |
| 2364 | 272 "Universal" |
| 2313 | 273 #endif |
| 274 }; | |
| 275 | |
| 2364 | 276 const guint n_chardet_detector_presets = G_N_ELEMENTS(chardet_detector_presets); |
| 2313 | 277 |
| 278 static bmp_cfg_boolent bmp_boolents[] = { | |
| 279 {"allow_multiple_instances", &cfg.allow_multiple_instances, TRUE}, | |
| 280 {"use_realtime", &cfg.use_realtime, TRUE}, | |
| 281 {"always_show_cb", &cfg.always_show_cb, TRUE}, | |
| 282 {"convert_underscore", &cfg.convert_underscore, TRUE}, | |
| 283 {"convert_twenty", &cfg.convert_twenty, TRUE}, | |
| 284 {"convert_slash", &cfg.convert_slash, TRUE }, | |
| 285 {"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE}, | |
| 286 {"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE}, | |
| 287 {"snap_windows", &cfg.snap_windows, TRUE}, | |
| 288 {"save_window_positions", &cfg.save_window_position, TRUE}, | |
| 289 {"dim_titlebar", &cfg.dim_titlebar, TRUE}, | |
| 290 {"get_info_on_load", &cfg.get_info_on_load, TRUE}, | |
| 291 {"get_info_on_demand", &cfg.get_info_on_demand, TRUE}, | |
| 292 {"eq_doublesize_linked", &cfg.eq_doublesize_linked, TRUE}, | |
| 293 {"no_playlist_advance", &cfg.no_playlist_advance, TRUE}, | |
| 294 {"refresh_file_list", &cfg.refresh_file_list, TRUE}, | |
| 295 {"sort_jump_to_file", &cfg.sort_jump_to_file, TRUE}, | |
| 296 {"use_pl_metadata", &cfg.use_pl_metadata, TRUE}, | |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
297 {"warn_about_win_visibility", &cfg.warn_about_win_visibility, TRUE}, |
| 2313 | 298 {"use_backslash_as_dir_delimiter", &cfg.use_backslash_as_dir_delimiter, TRUE}, |
| 299 {"player_shaded", &cfg.player_shaded, TRUE}, | |
| 300 {"player_visible", &cfg.player_visible, TRUE}, | |
| 301 {"shuffle", &cfg.shuffle, TRUE}, | |
| 302 {"repeat", &cfg.repeat, TRUE}, | |
| 303 {"doublesize", &cfg.doublesize, TRUE}, | |
| 304 {"autoscroll_songname", &cfg.autoscroll, TRUE}, | |
| 305 {"stop_after_current_song", &cfg.stopaftersong, TRUE}, | |
| 306 {"playlist_shaded", &cfg.playlist_shaded, TRUE}, | |
| 307 {"playlist_visible", &cfg.playlist_visible, TRUE}, | |
| 308 {"use_fontsets", &cfg.use_fontsets, TRUE}, | |
| 309 {"mainwin_use_xfont", &cfg.mainwin_use_xfont, FALSE}, | |
| 310 {"equalizer_visible", &cfg.equalizer_visible, TRUE}, | |
| 311 {"equalizer_active", &cfg.equalizer_active, TRUE}, | |
| 312 {"equalizer_shaded", &cfg.equalizer_shaded, TRUE}, | |
| 313 {"equalizer_autoload", &cfg.equalizer_autoload, TRUE}, | |
| 314 {"easy_move", &cfg.easy_move, TRUE}, | |
| 315 {"use_eplugins", &cfg.use_eplugins, TRUE}, | |
| 316 {"always_on_top", &cfg.always_on_top, TRUE}, | |
| 317 {"sticky", &cfg.sticky, TRUE}, | |
| 318 {"random_skin_on_play", &cfg.random_skin_on_play, TRUE}, | |
| 319 {"pause_between_songs", &cfg.pause_between_songs, TRUE}, | |
| 320 {"show_wm_decorations", &cfg.show_wm_decorations, TRUE}, | |
| 321 {"eq_extra_filtering", &cfg.eq_extra_filtering, TRUE}, | |
| 322 {"analyzer_peaks", &cfg.analyzer_peaks, TRUE}, | |
| 323 {"custom_cursors", &cfg.custom_cursors, TRUE}, | |
| 324 {"close_dialog_open", &cfg.close_dialog_open, TRUE}, | |
| 325 {"close_dialog_add", &cfg.close_dialog_add, TRUE}, | |
| 326 {"resume_playback_on_startup", &cfg.resume_playback_on_startup, TRUE}, | |
| 327 {"playlist_detect", &cfg.playlist_detect, TRUE}, | |
| 328 {"show_filepopup_for_tuple", &cfg.show_filepopup_for_tuple, TRUE}, | |
| 329 {"recurse_for_cover", &cfg.recurse_for_cover, TRUE}, | |
| 330 {"use_file_cover", &cfg.use_file_cover, TRUE}, | |
| 331 {"use_xmms_style_fileselector", &cfg.use_xmms_style_fileselector, TRUE}, | |
| 332 {"use_extension_probing", &cfg.use_extension_probing, TRUE}, | |
| 2405 | 333 {"filepopup_showprogressbar", &cfg.filepopup_showprogressbar, TRUE}, |
|
2805
6295535fbf49
[svn] - add toggle button to keep jtf dialog opened on jump.
yaz
parents:
2788
diff
changeset
|
334 {"close_jtf_dialog", &cfg.close_jtf_dialog, TRUE}, |
|
2968
83f03505f819
add support for one-way text scroll.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
2938
diff
changeset
|
335 {"twoway_scroll", &cfg.twoway_scroll, TRUE}, |
|
3543
6b8c8e051c1b
Add new configuration option: Software Volume Control.
William Pitcock <nenolod@atheme.org>
parents:
3530
diff
changeset
|
336 {"software_volume_control", &cfg.software_volume_control, TRUE}, |
| 2313 | 337 }; |
| 338 | |
| 339 static gint ncfgbent = G_N_ELEMENTS(bmp_boolents); | |
| 340 | |
| 341 static bmp_cfg_nument bmp_numents[] = { | |
| 342 {"player_x", &cfg.player_x, TRUE}, | |
| 343 {"player_y", &cfg.player_y, TRUE}, | |
| 344 {"timer_mode", &cfg.timer_mode, TRUE}, | |
| 345 {"vis_type", &cfg.vis_type, TRUE}, | |
| 346 {"analyzer_mode", &cfg.analyzer_mode, TRUE}, | |
| 347 {"analyzer_type", &cfg.analyzer_type, TRUE}, | |
| 348 {"scope_mode", &cfg.scope_mode, TRUE}, | |
| 349 {"vu_mode", &cfg.vu_mode, TRUE}, | |
| 350 {"voiceprint_mode", &cfg.voiceprint_mode, TRUE}, | |
| 351 {"vis_refresh_rate", &cfg.vis_refresh, TRUE}, | |
| 352 {"analyzer_falloff", &cfg.analyzer_falloff, TRUE}, | |
| 353 {"peaks_falloff", &cfg.peaks_falloff, TRUE}, | |
| 354 {"playlist_x", &cfg.playlist_x, TRUE}, | |
| 355 {"playlist_y", &cfg.playlist_y, TRUE}, | |
| 356 {"playlist_width", &cfg.playlist_width, TRUE}, | |
| 357 {"playlist_height", &cfg.playlist_height, TRUE}, | |
| 358 {"playlist_position", &cfg.playlist_position, TRUE}, | |
| 359 {"equalizer_x", &cfg.equalizer_x, TRUE}, | |
| 360 {"equalizer_y", &cfg.equalizer_y, TRUE}, | |
| 361 {"snap_distance", &cfg.snap_distance, TRUE}, | |
| 362 {"pause_between_songs_time", &cfg.pause_between_songs_time, TRUE}, | |
| 363 {"mouse_wheel_change", &cfg.mouse_change, TRUE}, | |
| 364 {"scroll_pl_by", &cfg.scroll_pl_by, TRUE}, | |
| 365 {"titlestring_preset", &cfg.titlestring_preset, TRUE}, | |
| 366 {"resume_playback_on_startup_time", &cfg.resume_playback_on_startup_time, TRUE}, | |
| 367 {"output_buffer_size", &cfg.output_buffer_size, TRUE}, | |
| 368 {"recurse_for_cover_depth", &cfg.recurse_for_cover_depth, TRUE}, | |
| 369 {"filepopup_pixelsize", &cfg.filepopup_pixelsize, TRUE}, | |
| 370 {"filepopup_delay", &cfg.filepopup_delay, TRUE}, | |
| 371 {"colorize_r", &cfg.colorize_r, TRUE}, | |
| 372 {"colorize_g", &cfg.colorize_g, TRUE}, | |
| 373 {"colorize_b", &cfg.colorize_b, TRUE}, | |
| 374 }; | |
| 375 | |
| 376 static gint ncfgient = G_N_ELEMENTS(bmp_numents); | |
| 377 | |
| 378 static bmp_cfg_strent bmp_strents[] = { | |
| 379 {"playlist_font", &cfg.playlist_font, TRUE}, | |
| 380 {"mainwin_font", &cfg.mainwin_font, TRUE}, | |
| 381 {"eqpreset_default_file", &cfg.eqpreset_default_file, TRUE}, | |
| 382 {"eqpreset_extension", &cfg.eqpreset_extension, TRUE}, | |
| 383 {"skin", &cfg.skin, FALSE}, | |
| 384 {"output_plugin", &cfg.outputplugin, FALSE}, | |
| 385 {"disabled_iplugins", &cfg.disabled_iplugins, TRUE}, | |
| 386 {"enabled_gplugins", &cfg.enabled_gplugins, FALSE}, | |
| 387 {"enabled_vplugins", &cfg.enabled_vplugins, FALSE}, | |
| 388 {"enabled_eplugins", &cfg.enabled_eplugins, FALSE}, | |
| 389 {"filesel_path", &cfg.filesel_path, FALSE}, | |
| 390 {"playlist_path", &cfg.playlist_path, FALSE}, | |
| 391 {"generic_title_format", &cfg.gentitle_format, TRUE}, | |
| 392 {"chardet_detector", &cfg.chardet_detector, TRUE}, | |
| 393 {"chardet_fallback", &cfg.chardet_fallback, TRUE}, | |
| 394 {"cover_name_include", &cfg.cover_name_include, TRUE}, | |
| 395 {"cover_name_exclude", &cfg.cover_name_exclude, TRUE}, | |
| 396 {"session_uri_base", &cfg.session_uri_base, TRUE} | |
| 397 }; | |
| 398 | |
| 399 static gint ncfgsent = G_N_ELEMENTS(bmp_strents); | |
| 400 | |
| 401 gchar *bmp_paths[BMP_PATH_COUNT] = {}; | |
| 402 | |
| 403 GList *dock_window_list = NULL; | |
| 404 | |
| 405 /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */ | |
| 406 static gchar *pl_candidates[] = { | |
| 2364 | 407 PLUGIN_FILENAME("ALSA"), |
| 408 PLUGIN_FILENAME("coreaudio"), | |
| 409 PLUGIN_FILENAME("OSS"), | |
| 410 PLUGIN_FILENAME("sun"), | |
| 411 PLUGIN_FILENAME("ESD"), | |
| 412 PLUGIN_FILENAME("pulse_audio"), | |
| 413 PLUGIN_FILENAME("disk_writer"), | |
| 414 NULL | |
| 2313 | 415 }; |
| 416 | |
| 417 GCond *cond_scan; | |
| 418 GMutex *mutex_scan; | |
|
3346
71d8d93f1bad
Implemented TrackChange, StatusChange signals, with a stub for CapsChange.
Ben Tucker <ben.tucker@gmail.com>
parents:
3334
diff
changeset
|
419 #ifdef USE_DBUS |
|
71d8d93f1bad
Implemented TrackChange, StatusChange signals, with a stub for CapsChange.
Ben Tucker <ben.tucker@gmail.com>
parents:
3334
diff
changeset
|
420 MprisPlayer *mpris; |
|
71d8d93f1bad
Implemented TrackChange, StatusChange signals, with a stub for CapsChange.
Ben Tucker <ben.tucker@gmail.com>
parents:
3334
diff
changeset
|
421 #endif |
| 2313 | 422 |
| 423 static GSList * | |
| 424 get_feature_list(void) | |
| 425 { | |
| 426 GSList *features = NULL; | |
| 427 | |
| 428 #ifdef HAVE_GCONF | |
| 429 features = g_slist_append(features, "GConf"); | |
| 430 #endif | |
| 431 | |
| 432 return features; | |
| 433 } | |
| 434 | |
| 435 static void | |
| 436 dump_version(void) | |
| 437 { | |
| 438 GSList *features; | |
| 439 | |
| 440 g_printf("%s %s [%s]", _(application_name), VERSION, svn_stamp); | |
| 441 | |
| 442 features = get_feature_list(); | |
| 443 | |
| 444 if (features) { | |
| 445 GSList *item; | |
| 446 | |
| 447 g_printf(" ("); | |
| 448 | |
| 449 for (item = features; g_slist_next(item); item = g_slist_next(item)) | |
| 450 g_printf("%s, ", (const gchar *) item->data); | |
| 451 | |
| 452 g_printf("%s)", (const gchar *) item->data); | |
| 453 | |
| 454 g_slist_free(features); | |
| 455 } | |
| 456 | |
| 457 g_printf("\n"); | |
| 458 } | |
| 459 | |
| 460 const gchar * | |
|
3334
ea806daf3ef0
rename xmms_get_gentitle_format() to get_gentitle_format().
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3317
diff
changeset
|
461 get_gentitle_format(void) |
| 2313 | 462 { |
| 463 guint titlestring_preset = cfg.titlestring_preset; | |
| 464 | |
| 465 if (titlestring_preset < n_titlestring_presets) | |
| 2364 | 466 return bmp_titlestring_presets[titlestring_preset]; |
| 2313 | 467 |
| 468 return cfg.gentitle_format; | |
| 469 } | |
| 470 | |
| 471 void | |
| 472 make_directory(const gchar * path, mode_t mode) | |
| 473 { | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
474 if (g_mkdir_with_parents(path, mode) == 0) |
| 2313 | 475 return; |
| 476 | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
477 g_printerr(_("Could not create directory (%s): %s\n"), path, |
| 2313 | 478 g_strerror(errno)); |
| 479 } | |
| 480 | |
| 481 static void | |
| 482 bmp_make_user_dir(void) | |
| 483 { | |
| 484 const mode_t mode755 = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; | |
| 485 | |
| 486 make_directory(bmp_paths[BMP_PATH_USER_DIR], mode755); | |
| 487 make_directory(bmp_paths[BMP_PATH_USER_PLUGIN_DIR], mode755); | |
| 488 make_directory(bmp_paths[BMP_PATH_USER_SKIN_DIR], mode755); | |
| 489 make_directory(bmp_paths[BMP_PATH_SKIN_THUMB_DIR], mode755); | |
|
3400
8764498b75ed
Add new playlists directory to paths
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3351
diff
changeset
|
490 make_directory(bmp_paths[BMP_PATH_PLAYLISTS_DIR], mode755); |
| 2313 | 491 } |
| 492 | |
| 493 static void | |
| 494 bmp_free_paths(void) | |
| 495 { | |
| 496 int i; | |
| 497 | |
| 498 for (i = 0; i < BMP_PATH_COUNT; i++) | |
| 499 { | |
| 500 g_free(bmp_paths[i]); | |
| 501 bmp_paths[i] = 0; | |
| 502 } | |
| 503 } | |
| 504 | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
505 static void |
|
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
506 bmp_init_paths() |
|
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
507 { |
| 2364 | 508 char *xdg_config_home; |
| 509 char *xdg_data_home; | |
| 510 char *xdg_cache_home; | |
| 2313 | 511 |
| 2364 | 512 xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL |
| 513 ? g_build_filename(g_get_home_dir(), ".config", NULL) | |
| 514 : g_strdup(getenv("XDG_CONFIG_HOME"))); | |
| 515 xdg_data_home = (getenv("XDG_DATA_HOME") == NULL | |
| 516 ? g_build_filename(g_get_home_dir(), ".local", "share", NULL) | |
| 517 : g_strdup(getenv("XDG_DATA_HOME"))); | |
| 518 xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL | |
| 519 ? g_build_filename(g_get_home_dir(), ".cache", NULL) | |
| 520 : g_strdup(getenv("XDG_CACHE_HOME"))); | |
| 2313 | 521 |
| 2364 | 522 bmp_paths[BMP_PATH_USER_DIR] = |
| 523 g_build_filename(xdg_config_home, "audacious", NULL); | |
| 524 bmp_paths[BMP_PATH_USER_SKIN_DIR] = | |
| 525 g_build_filename(xdg_data_home, "audacious", "Skins", NULL); | |
| 526 bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = | |
|
2506
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
527 g_build_filename(xdg_data_home, "audacious", "Plugins", NULL); |
|
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
528 |
| 2364 | 529 bmp_paths[BMP_PATH_SKIN_THUMB_DIR] = |
| 530 g_build_filename(xdg_cache_home, "audacious", "thumbs", NULL); | |
| 2313 | 531 |
|
3400
8764498b75ed
Add new playlists directory to paths
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3351
diff
changeset
|
532 bmp_paths[BMP_PATH_PLAYLISTS_DIR] = |
|
8764498b75ed
Add new playlists directory to paths
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3351
diff
changeset
|
533 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "playlists", NULL); |
|
8764498b75ed
Add new playlists directory to paths
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3351
diff
changeset
|
534 |
| 2364 | 535 bmp_paths[BMP_PATH_CONFIG_FILE] = |
| 536 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "config", NULL); | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
537 #ifdef HAVE_XSPF_PLAYLIST |
| 2364 | 538 bmp_paths[BMP_PATH_PLAYLIST_FILE] = |
| 539 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], | |
| 540 "playlist.xspf", NULL); | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
541 #else |
| 2364 | 542 bmp_paths[BMP_PATH_PLAYLIST_FILE] = |
| 543 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], | |
| 544 "playlist.m3u", NULL); | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
545 #endif |
| 2364 | 546 bmp_paths[BMP_PATH_ACCEL_FILE] = |
| 547 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "accels", NULL); | |
| 548 bmp_paths[BMP_PATH_LOG_FILE] = | |
| 549 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL); | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
550 |
| 2463 | 551 bmp_paths[BMP_PATH_GTKRC_FILE] = |
| 2570 | 552 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL); |
| 2463 | 553 |
| 2364 | 554 g_free(xdg_config_home); |
| 555 g_free(xdg_data_home); | |
| 556 g_free(xdg_cache_home); | |
|
2317
49d285f6008b
[svn] Full support for XDG basedir added. The old config doesn't get automatically converted yet.
js
parents:
2313
diff
changeset
|
557 |
| 2364 | 558 g_atexit(bmp_free_paths); |
| 2313 | 559 } |
| 560 | |
| 561 void | |
|
2682
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
562 bmp_config_free(void) |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
563 { |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
564 gint i; |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
565 for (i = 0; i < ncfgsent; ++i) { |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
566 if ( *(bmp_strents[i].se_vloc) != NULL ) |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
567 { |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
568 g_free( *(bmp_strents[i].se_vloc) ); |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
569 *(bmp_strents[i].se_vloc) = NULL; |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
570 } |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
571 } |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
572 } |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
573 |
|
c3cd6e47faf6
[svn] - make the evil 'reload plugins' button behave a bit better
giacomo
parents:
2662
diff
changeset
|
574 void |
| 2313 | 575 bmp_config_load(void) |
| 576 { | |
| 577 ConfigDb *db; | |
| 578 gint i, length; | |
| 579 | |
| 580 memcpy(&cfg, &bmp_default_config, sizeof(BmpConfig)); | |
| 581 | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
582 db = cfg_db_open(); |
| 2313 | 583 for (i = 0; i < ncfgbent; ++i) { |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
584 cfg_db_get_bool(db, NULL, |
| 2313 | 585 bmp_boolents[i].be_vname, |
| 586 bmp_boolents[i].be_vloc); | |
| 587 } | |
| 588 | |
| 589 for (i = 0; i < ncfgient; ++i) { | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
590 cfg_db_get_int(db, NULL, |
| 2313 | 591 bmp_numents[i].ie_vname, |
| 592 bmp_numents[i].ie_vloc); | |
| 593 } | |
| 594 | |
| 595 for (i = 0; i < ncfgsent; ++i) { | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
596 cfg_db_get_string(db, NULL, |
| 2313 | 597 bmp_strents[i].se_vname, |
| 598 bmp_strents[i].se_vloc); | |
| 599 } | |
| 600 | |
| 601 /* Preset */ | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
602 cfg_db_get_float(db, NULL, "equalizer_preamp", &cfg.equalizer_preamp); |
| 2313 | 603 for (i = 0; i < 10; i++) { |
| 604 gchar eqtext[18]; | |
| 605 | |
| 606 g_snprintf(eqtext, sizeof(eqtext), "equalizer_band%d", i); | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
607 cfg_db_get_float(db, NULL, eqtext, &cfg.equalizer_bands[i]); |
| 2313 | 608 } |
| 609 | |
| 610 /* History */ | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
611 if (cfg_db_get_int(db, NULL, "url_history_length", &length)) { |
| 2313 | 612 for (i = 1; i <= length; i++) { |
| 613 gchar str[19], *tmp; | |
| 614 | |
| 615 g_snprintf(str, sizeof(str), "url_history%d", i); | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
616 if (cfg_db_get_string(db, NULL, str, &tmp)) |
| 2313 | 617 cfg.url_history = g_list_append(cfg.url_history, tmp); |
| 618 } | |
| 619 } | |
| 620 | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
621 cfg_db_close(db); |
| 2313 | 622 |
| 623 | |
| 624 if (cfg.playlist_font && strlen(cfg.playlist_font) == 0) { | |
| 625 g_free(cfg.playlist_font); | |
| 626 cfg.playlist_font = NULL; | |
| 627 } | |
| 628 | |
| 629 if (cfg.mainwin_font && strlen(cfg.mainwin_font) == 0) { | |
| 630 g_free(cfg.mainwin_font); | |
| 631 cfg.mainwin_font = NULL; | |
| 632 } | |
| 633 | |
| 634 if (!cfg.playlist_font) | |
| 635 cfg.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT); | |
| 636 | |
| 637 if (!cfg.mainwin_font) | |
| 638 cfg.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT); | |
| 639 | |
| 640 if (!cfg.gentitle_format) | |
| 3317 | 641 cfg.gentitle_format = g_strdup("${?artist:${artist} - }${?album:${album} - }${title}"); |
| 2313 | 642 |
| 643 if (!cfg.outputplugin) { | |
| 2364 | 644 gint iter; |
| 2313 | 645 gchar *pl_path = g_build_filename(PLUGIN_DIR, plugin_dir_list[0], NULL); |
| 646 | |
| 647 for (iter = 0; pl_candidates[iter] != NULL && cfg.outputplugin == NULL; iter++) | |
| 2364 | 648 { |
| 649 cfg.outputplugin = find_file_recursively(pl_path, pl_candidates[iter]); | |
| 650 } | |
| 2313 | 651 |
| 652 g_free(pl_path); | |
| 653 } | |
| 654 | |
| 655 if (!cfg.eqpreset_default_file) | |
| 656 cfg.eqpreset_default_file = g_strdup(EQUALIZER_DEFAULT_DIR_PRESET); | |
| 657 | |
| 658 if (!cfg.eqpreset_extension) | |
| 659 cfg.eqpreset_extension = g_strdup(EQUALIZER_DEFAULT_PRESET_EXT); | |
| 660 | |
| 661 if (!cfg.chardet_detector) | |
| 662 cfg.chardet_detector = g_strdup(""); | |
| 663 | |
| 664 if (!cfg.chardet_fallback) | |
| 665 cfg.chardet_fallback = g_strdup(""); | |
| 666 | |
| 667 if (!cfg.cover_name_include) | |
| 2364 | 668 cfg.cover_name_include = g_strdup(""); |
| 2313 | 669 |
| 670 if (!cfg.cover_name_exclude) | |
| 2364 | 671 cfg.cover_name_exclude = g_strdup("back"); |
| 2313 | 672 |
| 673 if (!cfg.session_uri_base) | |
| 674 cfg.session_uri_base = g_strdup(""); | |
| 675 | |
| 676 /* at least one of these should be true */ | |
| 677 if ((!cfg.get_info_on_demand) && (!cfg.get_info_on_load)) | |
| 678 cfg.get_info_on_demand = TRUE; | |
| 679 } | |
| 680 | |
|
3481
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
681 static gboolean |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
682 save_extra_playlist(const gchar * path, const gchar * basename, |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
683 gpointer savedlist) |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
684 { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
685 GList *playlists, *iter; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
686 GList **saved; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
687 Playlist *playlist; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
688 int found; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
689 gchar *filename; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
690 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
691 playlists = playlist_get_playlists(); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
692 saved = (GList **) savedlist; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
693 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
694 found = 0; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
695 for (iter = playlists; iter; iter = iter->next) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
696 playlist = (Playlist *) iter->data; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
697 if (g_list_find(*saved, playlist)) continue; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
698 filename = playlist_filename_get(playlist); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
699 if (!filename) continue; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
700 if (strcmp(filename, path) == 0) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
701 /* Save playlist */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
702 playlist_save(playlist, path); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
703 *saved = g_list_prepend(*saved, playlist); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
704 found = 1; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
705 g_free(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
706 break; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
707 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
708 g_free(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
709 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
710 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
711 if(!found) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
712 /* Remove playlist */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
713 unlink(path); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
714 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
715 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
716 return FALSE; /* process other playlists */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
717 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
718 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
719 static void |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
720 save_other_playlists(GList *saved) |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
721 { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
722 GList *playlists, *iter; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
723 Playlist *playlist; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
724 gchar *pos, *ext, *basename, *filename, *newbasename; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
725 int i, num, isdigits; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
726 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
727 playlists = playlist_get_playlists(); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
728 for(iter = playlists; iter; iter = iter->next) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
729 playlist = (Playlist *) iter->data; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
730 if (g_list_find(saved, playlist)) continue; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
731 filename = playlist_filename_get(playlist); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
732 if (!filename || !filename[0] |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
733 || g_file_test(filename, G_FILE_TEST_IS_DIR)) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
734 /* default basename */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
735 #ifdef HAVE_XSPF_PLAYLIST |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
736 basename = g_strdup("playlist_01.xspf"); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
737 #else |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
738 basename = g_strdup("playlist_01.m3u"); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
739 #endif |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
740 } else { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
741 basename = g_path_get_basename(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
742 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
743 g_free(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
744 if ((pos = strrchr(basename, '.'))) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
745 *pos = '\0'; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
746 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
747 #ifdef HAVE_XSPF_PLAYLIST |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
748 ext = ".xspf"; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
749 #else |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
750 ext = ".m3u"; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
751 #endif |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
752 num = -1; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
753 if ((pos = strrchr(basename, '_'))) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
754 isdigits = 0; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
755 for (i=1; pos[i]; i++) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
756 if (!g_ascii_isdigit(pos[i])) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
757 isdigits = 0; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
758 break; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
759 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
760 isdigits = 1; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
761 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
762 if (isdigits) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
763 num = atoi(pos+1) + 1; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
764 *pos = '\0'; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
765 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
766 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
767 /* attempt to generate unique filename */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
768 filename = NULL; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
769 do { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
770 g_free(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
771 if (num < 0) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
772 /* try saving without number first */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
773 newbasename = g_strdup_printf("%s%s", basename, ext); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
774 num = 1; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
775 } else { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
776 newbasename = g_strdup_printf("%s_%02d%s", basename, num, ext); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
777 num++; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
778 if (num < 0) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
779 g_warning("Playlist number in filename overflowed." |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
780 " Not saving playlist.\n"); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
781 goto cleanup; |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
782 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
783 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
784 filename = g_build_filename(bmp_paths[BMP_PATH_PLAYLISTS_DIR], |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
785 newbasename, NULL); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
786 g_free(newbasename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
787 } while (g_file_test(filename, G_FILE_TEST_EXISTS)); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
788 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
789 playlist_save(playlist, filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
790 cleanup: |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
791 g_free(filename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
792 g_free(basename); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
793 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
794 } |
| 2313 | 795 |
| 796 void | |
| 797 bmp_config_save(void) | |
| 798 { | |
| 799 GList *node; | |
| 800 gchar *str; | |
| 801 gint i, cur_pb_time; | |
| 802 ConfigDb *db; | |
|
3481
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
803 GList *saved; |
| 2313 | 804 Playlist *playlist = playlist_get_active(); |
| 805 | |
| 806 cfg.disabled_iplugins = input_stringify_disabled_list(); | |
| 807 | |
| 808 | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
809 db = cfg_db_open(); |
| 2313 | 810 |
| 811 for (i = 0; i < ncfgbent; ++i) | |
| 812 if (bmp_boolents[i].be_wrt) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
813 cfg_db_set_bool(db, NULL, |
| 2313 | 814 bmp_boolents[i].be_vname, |
| 815 *bmp_boolents[i].be_vloc); | |
| 816 | |
| 817 for (i = 0; i < ncfgient; ++i) | |
| 818 if (bmp_numents[i].ie_wrt) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
819 cfg_db_set_int(db, NULL, |
| 2313 | 820 bmp_numents[i].ie_vname, |
| 821 *bmp_numents[i].ie_vloc); | |
| 822 | |
| 823 /* This is a bit lame .. it'll end up being written twice, | |
| 824 * could do with being done a bit neater. -larne */ | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
825 cfg_db_set_int(db, NULL, "playlist_position", |
| 2313 | 826 playlist_get_position(playlist)); |
| 827 | |
| 2530 | 828 /* FIXME: we're looking up SkinnedWindow::x &c ourselves here. |
| 829 * this isn't exactly right. -nenolod | |
| 830 */ | |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
831 if ( SKINNED_WINDOW(playlistwin)->x != -1 && |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
832 SKINNED_WINDOW(playlistwin)->y != -1 ) |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
833 { |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
834 cfg_db_set_int(db, NULL, "playlist_x", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
835 SKINNED_WINDOW(playlistwin)->x); |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
836 cfg_db_set_int(db, NULL, "playlist_y", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
837 SKINNED_WINDOW(playlistwin)->y); |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
838 } |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
839 |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
840 if ( SKINNED_WINDOW(mainwin)->x != -1 && |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
841 SKINNED_WINDOW(mainwin)->y != -1 ) |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
842 { |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
843 cfg_db_set_int(db, NULL, "player_x", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
844 SKINNED_WINDOW(mainwin)->x); |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
845 cfg_db_set_int(db, NULL, "player_y", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
846 SKINNED_WINDOW(mainwin)->y); |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
847 } |
| 2530 | 848 |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
849 if ( SKINNED_WINDOW(equalizerwin)->x != -1 && |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
850 SKINNED_WINDOW(equalizerwin)->y != -1 ) |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
851 { |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
852 cfg_db_set_int(db, NULL, "equalizer_x", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
853 SKINNED_WINDOW(equalizerwin)->x); |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
854 cfg_db_set_int(db, NULL, "equalizer_y", |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
855 SKINNED_WINDOW(equalizerwin)->y); |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
856 } |
| 2530 | 857 |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
858 cfg_db_set_bool(db, NULL, "mainwin_use_xfont", |
| 2364 | 859 cfg.mainwin_use_xfont); |
| 2313 | 860 |
| 861 for (i = 0; i < ncfgsent; ++i) { | |
| 862 if (bmp_strents[i].se_wrt) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
863 cfg_db_set_string(db, NULL, |
| 2313 | 864 bmp_strents[i].se_vname, |
| 865 *bmp_strents[i].se_vloc); | |
| 866 } | |
| 867 | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
868 cfg_db_set_float(db, NULL, "equalizer_preamp", cfg.equalizer_preamp); |
| 2313 | 869 |
| 870 for (i = 0; i < 10; i++) { | |
| 871 str = g_strdup_printf("equalizer_band%d", i); | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
872 cfg_db_set_float(db, NULL, str, cfg.equalizer_bands[i]); |
| 2313 | 873 g_free(str); |
| 874 } | |
| 875 | |
| 876 if (bmp_active_skin != NULL) | |
| 877 { | |
| 878 if (bmp_active_skin->path) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
879 cfg_db_set_string(db, NULL, "skin", bmp_active_skin->path); |
| 2313 | 880 else |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
881 cfg_db_unset_key(db, NULL, "skin"); |
| 2313 | 882 } |
| 883 | |
| 884 if (get_current_output_plugin()) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
885 cfg_db_set_string(db, NULL, "output_plugin", |
| 2313 | 886 get_current_output_plugin()->filename); |
| 887 else | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
888 cfg_db_unset_key(db, NULL, "output_plugin"); |
| 2313 | 889 |
| 890 str = general_stringify_enabled_list(); | |
| 891 if (str) { | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
892 cfg_db_set_string(db, NULL, "enabled_gplugins", str); |
| 2313 | 893 g_free(str); |
| 894 } | |
| 895 else | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
896 cfg_db_unset_key(db, NULL, "enabled_gplugins"); |
| 2313 | 897 |
| 898 str = vis_stringify_enabled_list(); | |
| 899 if (str) { | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
900 cfg_db_set_string(db, NULL, "enabled_vplugins", str); |
| 2313 | 901 g_free(str); |
| 902 } | |
| 903 else | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
904 cfg_db_unset_key(db, NULL, "enabled_vplugins"); |
| 2313 | 905 |
| 906 str = effect_stringify_enabled_list(); | |
| 907 if (str) { | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
908 cfg_db_set_string(db, NULL, "enabled_eplugins", str); |
| 2313 | 909 g_free(str); |
| 910 } | |
| 911 else | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
912 cfg_db_unset_key(db, NULL, "enabled_eplugins"); |
| 2313 | 913 |
| 914 if (cfg.filesel_path) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
915 cfg_db_set_string(db, NULL, "filesel_path", cfg.filesel_path); |
| 2313 | 916 |
| 917 if (cfg.playlist_path) | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
918 cfg_db_set_string(db, NULL, "playlist_path", cfg.playlist_path); |
| 2313 | 919 |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
920 cfg_db_set_int(db, NULL, "url_history_length", |
| 2313 | 921 g_list_length(cfg.url_history)); |
| 922 | |
| 923 for (node = cfg.url_history, i = 1; node; node = g_list_next(node), i++) { | |
| 924 str = g_strdup_printf("url_history%d", i); | |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
925 cfg_db_set_string(db, NULL, str, node->data); |
| 2313 | 926 g_free(str); |
| 927 } | |
| 928 | |
| 929 if (playback_get_playing()) { | |
| 2364 | 930 cur_pb_time = playback_get_time(); |
| 2313 | 931 } else |
| 2364 | 932 cur_pb_time = -1; |
| 2313 | 933 cfg.resume_playback_on_startup_time = cur_pb_time; |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
934 cfg_db_set_int(db, NULL, "resume_playback_on_startup_time", |
| 2364 | 935 cfg.resume_playback_on_startup_time); |
| 2313 | 936 |
|
3686
259b7d3e0976
sed s/bmp_cfg_db/cfg_db/.
William Pitcock <nenolod@atheme.org>
parents:
3679
diff
changeset
|
937 cfg_db_close(db); |
| 2313 | 938 |
| 939 playlist_save(playlist, bmp_paths[BMP_PATH_PLAYLIST_FILE]); | |
|
3481
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
940 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
941 /* Save extra playlists that were loaded from PLAYLISTS_DIR */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
942 saved = NULL; |
|
3530
08dae20c75f0
Don't store default playlist in the playlists/ directory.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3526
diff
changeset
|
943 saved = g_list_prepend(saved, playlist); /* don't save default again */ |
|
3481
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
944 if(!dir_foreach(bmp_paths[BMP_PATH_PLAYLISTS_DIR], save_extra_playlist, |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
945 &saved, NULL)) { |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
946 g_warning("Could not save extra playlists\n"); |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
947 } |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
948 |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
949 /* Save other playlists to PLAYLISTS_DIR */ |
|
308e5fb348db
Save extra playlists on exit
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3480
diff
changeset
|
950 save_other_playlists(saved); |
| 2313 | 951 } |
| 952 | |
| 953 static void | |
| 954 bmp_set_default_icon(void) | |
| 955 { | |
| 956 GdkPixbuf *icon; | |
| 957 | |
| 958 icon = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm); | |
| 959 gtk_window_set_default_icon(icon); | |
| 960 g_object_unref(icon); | |
| 961 } | |
| 962 | |
|
3525
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
963 #ifdef GDK_WINDOWING_QUARTZ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
964 static void |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
965 set_dock_icon(void) |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
966 { |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
967 GdkPixbuf *icon, *pixbuf; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
968 CGColorSpaceRef colorspace; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
969 CGDataProviderRef data_provider; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
970 CGImageRef image; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
971 gpointer data; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
972 gint rowstride, pixbuf_width, pixbuf_height; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
973 gboolean has_alpha; |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
974 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
975 icon = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
976 pixbuf = gdk_pixbuf_scale_simple(icon, 128, 128, GDK_INTERP_BILINEAR); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
977 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
978 data = gdk_pixbuf_get_pixels(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
979 pixbuf_width = gdk_pixbuf_get_width(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
980 pixbuf_height = gdk_pixbuf_get_height(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
981 rowstride = gdk_pixbuf_get_rowstride(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
982 has_alpha = gdk_pixbuf_get_has_alpha(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
983 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
984 /* create the colourspace for the CGImage. */ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
985 colorspace = CGColorSpaceCreateDeviceRGB(); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
986 data_provider = CGDataProviderCreateWithData(NULL, data, pixbuf_height * rowstride, NULL); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
987 image = CGImageCreate(pixbuf_width, pixbuf_height, 8, |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
988 has_alpha ? 32 : 24, rowstride, colorspace, |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
989 has_alpha ? kCGImageAlphaLast : 0, |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
990 data_provider, NULL, FALSE, |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
991 kCGRenderingIntentDefault); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
992 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
993 /* release the colourspace and data provider, we have what we want. */ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
994 CGDataProviderRelease(data_provider); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
995 CGColorSpaceRelease(colorspace); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
996 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
997 /* set the dock tile images */ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
998 SetApplicationDockTileImage(image); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
999 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1000 #if 0 |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1001 /* and release */ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1002 CGImageRelease(image); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1003 g_object_unref(icon); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1004 g_object_unref(pixbuf); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1005 #endif |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1006 } |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1007 #endif |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1008 |
| 2313 | 1009 static void |
| 1010 register_aud_stock_icons(void) | |
| 1011 { | |
| 1012 GtkIconFactory *iconfactory = gtk_icon_factory_new(); | |
| 1013 GtkIconSet *iconset; | |
| 1014 GdkPixbuf *pixbuf; | |
| 1015 | |
| 1016 /* pick images in icons-csource.h */ | |
| 1017 pixbuf = gdk_pixbuf_new_from_inline( -1 , removedups_pixbuf , FALSE , NULL ); | |
| 1018 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1019 gtk_icon_factory_add( iconfactory , AUD_STOCK_REMOVEDUPS , iconset ); | |
| 1020 pixbuf = gdk_pixbuf_new_from_inline( -1 , removeunavail_pixbuf , FALSE , NULL ); | |
| 1021 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1022 gtk_icon_factory_add( iconfactory , AUD_STOCK_REMOVEUNAVAIL , iconset ); | |
| 1023 pixbuf = gdk_pixbuf_new_from_inline( -1 , randomizepl_pixbuf , FALSE , NULL ); | |
| 1024 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1025 gtk_icon_factory_add( iconfactory , AUD_STOCK_RANDOMIZEPL , iconset ); | |
| 1026 pixbuf = gdk_pixbuf_new_from_inline( -1 , sortbytitle_pixbuf , FALSE , NULL ); | |
| 1027 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1028 gtk_icon_factory_add( iconfactory , AUD_STOCK_SORTBYTITLE , iconset ); | |
| 1029 pixbuf = gdk_pixbuf_new_from_inline( -1 , sortbyfilename_pixbuf , FALSE , NULL ); | |
| 1030 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1031 gtk_icon_factory_add( iconfactory , AUD_STOCK_SORTBYFILENAME , iconset ); | |
| 1032 pixbuf = gdk_pixbuf_new_from_inline( -1 , sortbyartist_pixbuf , FALSE , NULL ); | |
| 1033 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1034 gtk_icon_factory_add( iconfactory , AUD_STOCK_SORTBYARTIST , iconset ); | |
| 1035 pixbuf = gdk_pixbuf_new_from_inline( -1 , sortbypathfile_pixbuf , FALSE , NULL ); | |
| 1036 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1037 gtk_icon_factory_add( iconfactory , AUD_STOCK_SORTBYPATHFILE , iconset ); | |
| 1038 pixbuf = gdk_pixbuf_new_from_inline( -1 , selectnone_pixbuf , FALSE , NULL ); | |
| 1039 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1040 gtk_icon_factory_add( iconfactory , AUD_STOCK_SELECTNONE , iconset ); | |
| 1041 pixbuf = gdk_pixbuf_new_from_inline( -1 , selectall_pixbuf , FALSE , NULL ); | |
| 1042 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1043 gtk_icon_factory_add( iconfactory , AUD_STOCK_SELECTALL , iconset ); | |
| 1044 pixbuf = gdk_pixbuf_new_from_inline( -1 , selectinvert_pixbuf , FALSE , NULL ); | |
| 1045 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1046 gtk_icon_factory_add( iconfactory , AUD_STOCK_SELECTINVERT , iconset ); | |
| 1047 pixbuf = gdk_pixbuf_new_from_inline( -1 , invertpl_pixbuf , FALSE , NULL ); | |
| 1048 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1049 gtk_icon_factory_add( iconfactory , AUD_STOCK_INVERTPL , iconset ); | |
| 1050 pixbuf = gdk_pixbuf_new_from_inline( -1 , queuetoggle_pixbuf , FALSE , NULL ); | |
| 1051 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1052 gtk_icon_factory_add( iconfactory , AUD_STOCK_QUEUETOGGLE , iconset ); | |
| 1053 pixbuf = gdk_pixbuf_new_from_inline( -1 , info_pixbuf , FALSE , NULL ); | |
| 1054 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1055 gtk_icon_factory_add( iconfactory , AUD_STOCK_INFO , iconset ); | |
| 1056 pixbuf = gdk_pixbuf_new_from_inline( -1 , playlist_pixbuf , FALSE , NULL ); | |
| 1057 iconset = gtk_icon_set_new_from_pixbuf( pixbuf ); g_object_unref( pixbuf ); | |
| 1058 gtk_icon_factory_add( iconfactory , AUD_STOCK_PLAYLIST , iconset ); | |
| 1059 | |
| 1060 gtk_icon_factory_add_default( iconfactory ); | |
| 1061 g_object_unref( iconfactory ); | |
| 1062 } | |
| 1063 | |
| 2411 | 1064 static GOptionEntry cmd_entries[] = { |
|
2448
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1065 {"session", 'n', 0, G_OPTION_ARG_INT, &options.session, N_("Select which Audacious session ID to use"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1066 {"rew", 'r', 0, G_OPTION_ARG_NONE, &options.rew, N_("Skip backwards in playlist"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1067 {"play", 'p', 0, G_OPTION_ARG_NONE, &options.play, N_("Start playing current playlist"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1068 {"pause", 'u', 0, G_OPTION_ARG_NONE, &options.pause, N_("Pause current song"), NULL}, |
| 2475 | 1069 {"stop", 's', 0, G_OPTION_ARG_NONE, &options.stop, N_("Stop current song"), NULL}, |
|
2551
cea3528b2996
[svn] Fix --play-pause commandline option, by Alex "Monkey" Maclean in #gentoo-x86
chainsaw
parents:
2530
diff
changeset
|
1070 {"play-pause", 't', 0, G_OPTION_ARG_NONE, &options.play_pause, N_("Pause if playing, play otherwise"), NULL}, |
|
2448
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1071 {"fwd", 'f', 0, G_OPTION_ARG_NONE, &options.fwd, N_("Skip forward in playlist"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1072 {"show-jump-box", 'j', 0, G_OPTION_ARG_NONE, &options.show_jump_box, N_("Display Jump to File dialog"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1073 {"enqueue", 'e', 0, G_OPTION_ARG_NONE, &options.enqueue, N_("Don't clear the playlist"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1074 {"enqueue-to-temp", 'E', 0, G_OPTION_ARG_NONE, &options.enqueue_to_temp, N_("Add new files to a temporary playlist"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1075 {"show-main-window", 'm', 0, G_OPTION_ARG_NONE, &options.mainwin, N_("Display the main window"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1076 {"activate", 'a', 0, G_OPTION_ARG_NONE, &options.activate, N_("Display all open Audacious windows"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1077 {"headless", 'H', 0, G_OPTION_ARG_NONE, &options.headless, N_("Enable headless operation"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1078 {"no-log", 'N', 0, G_OPTION_ARG_NONE, &options.no_log, N_("Print all errors and warnings to stdout"), NULL}, |
|
ff135e2ba10e
[svn] - mark some strings used by GOption as translatable
nenolod
parents:
2420
diff
changeset
|
1079 {"version", 'v', 0, G_OPTION_ARG_NONE, &options.version, N_("Show version and builtin features"), NULL}, |
| 2411 | 1080 {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &options.filenames, N_("FILE..."), NULL}, |
| 1081 {NULL}, | |
| 1082 }; | |
| 2313 | 1083 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1084 static gboolean |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1085 aud_start_playback(gpointer unused) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1086 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1087 drct_play(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1088 return FALSE; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1089 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1090 |
| 2313 | 1091 static void |
| 1092 handle_cmd_line_options(BmpCmdLineOpt * options, | |
| 1093 gboolean remote) | |
| 1094 { | |
| 2411 | 1095 gchar **filenames = options->filenames; |
| 2785 | 1096 #ifdef USE_DBUS |
| 1097 DBusGProxy *session = audacious_get_dbus_proxy(); | |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1098 gboolean is_running = audacious_remote_is_running(session); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1099 #else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1100 gboolean is_running = FALSE; |
|
2727
14f9a629ba9c
[svn] - rename xmms_remote namespace to audacious_remote namespace
nenolod
parents:
2717
diff
changeset
|
1101 #endif |
| 2313 | 1102 |
| 2411 | 1103 if (options->version) |
| 1104 { | |
| 1105 dump_version(); | |
| 1106 exit(EXIT_SUCCESS); | |
| 1107 } | |
| 1108 | |
|
2788
b2b920b165ad
[svn] - exclude codes which use session if USE_DBUS is not defined.
yaz
parents:
2786
diff
changeset
|
1109 #ifdef USE_DBUS |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1110 if (is_running) |
| 2411 | 1111 { |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1112 if (filenames != NULL) |
| 2411 | 1113 { |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1114 gint pos = 0; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1115 gint i = 0; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1116 GList *fns = NULL; |
|
2512
3a1fc6f7c187
[svn] - unbreak relative path support. closes #791.
nenolod
parents:
2506
diff
changeset
|
1117 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1118 for (i = 0; filenames[i] != NULL; i++) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1119 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1120 gchar *filename; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1121 gchar *current_dir = g_get_current_dir(); |
| 2313 | 1122 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1123 if (!strstr(filenames[i], "://")) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1124 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1125 if (filenames[i][0] == '/') |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1126 filename = g_strdup_printf("file:///%s", filenames[i]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1127 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1128 filename = g_strdup_printf("file:///%s/%s", current_dir, filenames[i]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1129 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1130 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1131 filename = g_strdup(filenames[i]); |
| 2411 | 1132 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1133 fns = g_list_prepend(fns, filename); |
| 2411 | 1134 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1135 g_free(current_dir); |
| 2411 | 1136 } |
|
2512
3a1fc6f7c187
[svn] - unbreak relative path support. closes #791.
nenolod
parents:
2506
diff
changeset
|
1137 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1138 fns = g_list_reverse(fns); |
|
2605
1ceaf00f9c6d
[svn] - fix handling of multiple files on the command line.
nenolod
parents:
2574
diff
changeset
|
1139 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1140 if (options->load_skins) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1141 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1142 audacious_remote_set_skin(session, filenames[0]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1143 skin_install_skin(filenames[0]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1144 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1145 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1146 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1147 GList *i; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1148 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1149 if (options->enqueue_to_temp) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1150 audacious_remote_playlist_enqueue_to_temp(session, filenames[0]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1151 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1152 if (options->enqueue && options->play) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1153 pos = audacious_remote_get_playlist_length(session); |
|
2605
1ceaf00f9c6d
[svn] - fix handling of multiple files on the command line.
nenolod
parents:
2574
diff
changeset
|
1154 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1155 if (!options->enqueue) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1156 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1157 audacious_remote_playlist_clear(session); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1158 audacious_remote_stop(session); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1159 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1160 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1161 for (i = fns; i != NULL; i = i->next) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1162 audacious_remote_playlist_add_url_string(session, i->data); |
| 2313 | 1163 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1164 if (options->enqueue && options->play && |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1165 audacious_remote_get_playlist_length(session) > pos) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1166 audacious_remote_set_playlist_pos(session, pos); |
|
2605
1ceaf00f9c6d
[svn] - fix handling of multiple files on the command line.
nenolod
parents:
2574
diff
changeset
|
1167 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1168 if (!options->enqueue) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1169 audacious_remote_play(session); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1170 } |
| 2313 | 1171 |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1172 g_list_foreach(fns, (GFunc) g_free, NULL); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1173 g_list_free(fns); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1174 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1175 g_strfreev(filenames); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1176 } /* filename */ |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1177 |
| 2832 | 1178 if (options->rew) |
| 1179 audacious_remote_playlist_prev(session); | |
| 2313 | 1180 |
| 2832 | 1181 if (options->play) |
| 1182 audacious_remote_play(session); | |
| 2313 | 1183 |
| 2832 | 1184 if (options->pause) |
| 1185 audacious_remote_pause(session); | |
| 2313 | 1186 |
| 2832 | 1187 if (options->stop) |
| 1188 audacious_remote_stop(session); | |
| 2313 | 1189 |
| 2832 | 1190 if (options->fwd) |
| 1191 audacious_remote_playlist_next(session); | |
| 2313 | 1192 |
| 2832 | 1193 if (options->play_pause) |
| 1194 audacious_remote_play_pause(session); | |
| 2313 | 1195 |
| 2832 | 1196 if (options->show_jump_box) |
| 1197 audacious_remote_show_jtf_box(session); | |
| 2313 | 1198 |
| 2832 | 1199 if (options->mainwin) |
| 1200 audacious_remote_main_win_toggle(session, TRUE); | |
| 2313 | 1201 |
| 2832 | 1202 if (options->activate) |
| 1203 audacious_remote_activate(session); | |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1204 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1205 exit(EXIT_SUCCESS); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1206 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1207 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1208 #endif |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1209 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1210 if (filenames != NULL) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1211 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1212 gint pos = 0; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1213 gint i = 0; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1214 GList *fns = NULL; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1215 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1216 for (i = 0; filenames[i] != NULL; i++) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1217 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1218 gchar *filename; |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1219 gchar *current_dir = g_get_current_dir(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1220 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1221 if (!strstr(filenames[i], "://")) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1222 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1223 if (filenames[i][0] == '/') |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1224 filename = g_strdup_printf("file:///%s", filenames[i]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1225 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1226 filename = g_strdup_printf("file:///%s/%s", current_dir, filenames[i]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1227 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1228 else |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1229 filename = g_strdup(filenames[i]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1230 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1231 fns = g_list_prepend(fns, filename); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1232 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1233 g_free(current_dir); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1234 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1235 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1236 fns = g_list_reverse(fns); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1237 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1238 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1239 if (options->enqueue_to_temp) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1240 drct_pl_enqueue_to_temp(filenames[0]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1241 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1242 if (options->enqueue && options->play) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1243 pos = drct_pl_get_length(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1244 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1245 if (!options->enqueue) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1246 { |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1247 drct_pl_clear(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1248 drct_stop(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1249 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1250 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1251 drct_pl_add(fns); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1252 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1253 if (options->enqueue && options->play && |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1254 drct_pl_get_length() > pos) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1255 drct_pl_set_pos(pos); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1256 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1257 if (!options->enqueue) |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1258 g_idle_add(aud_start_playback, NULL); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1259 } |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1260 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1261 g_list_foreach(fns, (GFunc) g_free, NULL); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1262 g_list_free(fns); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1263 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1264 g_strfreev(filenames); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1265 } /* filename */ |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1266 |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1267 if (options->rew) |
| 3753 | 1268 drct_pl_prev(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1269 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1270 if (options->play) |
| 3753 | 1271 drct_play(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1272 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1273 if (options->pause) |
| 3753 | 1274 drct_pause(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1275 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1276 if (options->stop) |
| 3753 | 1277 drct_stop(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1278 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1279 if (options->fwd) |
| 3753 | 1280 drct_pl_next(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1281 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1282 if (options->play_pause) { |
| 3753 | 1283 if (drct_get_paused()) |
| 1284 drct_play(); | |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1285 else |
| 3753 | 1286 drct_pause(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1287 } |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1288 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1289 if (options->show_jump_box) |
| 3753 | 1290 drct_jtf_show(); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1291 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1292 if (options->mainwin) |
| 3753 | 1293 drct_main_win_toggle(TRUE); |
|
2845
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1294 |
|
a124656d4423
added handlers for cmd line args when remote == false
Ben Tucker <ben.tucker@gmail.com>
parents:
2838
diff
changeset
|
1295 if (options->activate) |
| 3753 | 1296 drct_activate(); |
| 2832 | 1297 } |
| 2313 | 1298 } |
| 1299 | |
| 1300 static void | |
| 1301 bmp_setup_logger(void) | |
| 1302 { | |
| 1303 if (!bmp_logger_start(bmp_paths[BMP_PATH_LOG_FILE])) | |
| 1304 return; | |
| 1305 | |
| 1306 g_atexit(bmp_logger_stop); | |
| 1307 } | |
| 1308 | |
| 1309 static void | |
| 1310 run_load_skin_error_dialog(const gchar * skin_path) | |
| 1311 { | |
| 1312 const gchar *markup = | |
| 1313 N_("<b><big>Unable to load skin.</big></b>\n" | |
| 1314 "\n" | |
| 1315 "Check that skin at '%s' is usable and default skin is properly " | |
| 1316 "installed at '%s'\n"); | |
| 1317 | |
| 1318 GtkWidget *dialog = | |
| 1319 gtk_message_dialog_new_with_markup(NULL, | |
| 1320 GTK_DIALOG_MODAL, | |
| 1321 GTK_MESSAGE_ERROR, | |
| 1322 GTK_BUTTONS_CLOSE, | |
| 1323 _(markup), | |
| 1324 skin_path, | |
| 1325 BMP_DEFAULT_SKIN_PATH); | |
| 1326 gtk_dialog_run(GTK_DIALOG(dialog)); | |
| 1327 gtk_widget_destroy(dialog); | |
| 1328 } | |
| 1329 | |
|
2908
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1330 void report_error(const gchar *error_message, ...) |
| 2313 | 1331 { |
|
2908
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1332 gchar *buf; |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1333 va_list va; |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1334 |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1335 va_start(va, error_message); |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1336 buf = g_strdup_vprintf(error_message, va); |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1337 va_end(va); |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1338 |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1339 fprintf(stderr, buf); |
| 2570 | 1340 |
| 1341 if (options.headless != 1) | |
| 1342 { | |
| 2313 | 1343 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(err), |
|
2908
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1344 buf); |
| 2313 | 1345 gtk_dialog_run(GTK_DIALOG(err)); |
| 1346 gtk_widget_hide(err); | |
| 1347 } | |
|
2908
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1348 |
|
6a474a7954a0
Allow for printf-style format strings to be passed to report_error() via g_strdup_vprintf().
William Pitcock <nenolod@atheme.org>
parents:
2907
diff
changeset
|
1349 g_free(buf); |
| 2313 | 1350 } |
| 1351 | |
| 2369 | 1352 static gboolean |
| 1353 aud_headless_iteration(gpointer unused) | |
| 1354 { | |
|
2506
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1355 free_vis_data(); |
|
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1356 return TRUE; |
| 2369 | 1357 } |
| 1358 | |
|
3480
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1359 static gboolean |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1360 load_extra_playlist(const gchar * path, const gchar * basename, |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1361 gpointer def) |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1362 { |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1363 const gchar *title; |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1364 Playlist *playlist; |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1365 Playlist *deflist; |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1366 |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1367 deflist = (Playlist *)def; |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1368 playlist = playlist_new(); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1369 if (!playlist) { |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1370 g_warning("Couldn't create new playlist\n"); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1371 return FALSE; |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1372 } |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1373 |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1374 playlist_add_playlist(playlist); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1375 playlist_load(playlist, path); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1376 |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1377 title = playlist_get_current_name(playlist); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1378 |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1379 return FALSE; /* keep loading other playlists */ |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1380 } |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1381 |
| 2313 | 1382 gint |
| 1383 main(gint argc, gchar ** argv) | |
| 1384 { | |
| 1385 gboolean gtk_init_check_ok; | |
| 1386 Playlist *playlist; | |
| 2411 | 1387 GOptionContext *context; |
| 1388 GError *error = NULL; | |
| 2313 | 1389 |
|
2644
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1390 /* glib-2.13.0 requires g_thread_init() to be called before all |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1391 other GLib functions */ |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1392 g_thread_init(NULL); |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1393 if (!g_thread_supported()) { |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1394 g_printerr(_("Sorry, threads isn't supported on your platform.\n\n" |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1395 "If you're on a libc5 based linux system and installed Glib & GTK+ before you\n" |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1396 "installed LinuxThreads you need to recompile Glib & GTK+.\n")); |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1397 exit(EXIT_FAILURE); |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1398 } |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1399 |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1400 gdk_threads_init(); |
|
67082557b2c4
[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
yaz
parents:
2605
diff
changeset
|
1401 |
| 2313 | 1402 /* Setup l10n early so we can print localized error messages */ |
| 1403 gtk_set_locale(); | |
| 1404 bindtextdomain(PACKAGE_NAME, LOCALEDIR); | |
| 1405 bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); | |
|
2388
52bcc18eb8bb
[svn] - attempt to bind the audacious-plugins domain
nenolod
parents:
2369
diff
changeset
|
1406 bindtextdomain(PACKAGE_NAME "-plugins", LOCALEDIR); |
|
52bcc18eb8bb
[svn] - attempt to bind the audacious-plugins domain
nenolod
parents:
2369
diff
changeset
|
1407 bind_textdomain_codeset(PACKAGE_NAME "-plugins", "UTF-8"); |
| 2313 | 1408 textdomain(PACKAGE_NAME); |
| 1409 | |
| 1410 bmp_init_paths(); | |
| 1411 bmp_make_user_dir(); | |
| 1412 | |
| 1413 g_set_application_name(_(application_name)); | |
| 1414 | |
| 1415 cond_scan = g_cond_new(); | |
| 1416 mutex_scan = g_mutex_new(); | |
| 1417 | |
| 2463 | 1418 gtk_rc_add_default_file(bmp_paths[BMP_PATH_GTKRC_FILE]); |
| 1419 | |
| 2313 | 1420 gtk_init_check_ok = gtk_init_check(&argc, &argv); |
| 2411 | 1421 |
| 2413 | 1422 memset(&options, '\0', sizeof(BmpCmdLineOpt)); |
| 1423 options.session = -1; | |
| 1424 | |
| 2411 | 1425 context = g_option_context_new(_("- play multimedia files")); |
| 1426 g_option_context_add_main_entries(context, cmd_entries, PACKAGE_NAME); | |
| 1427 g_option_context_add_group(context, gtk_get_option_group(TRUE)); | |
| 1428 g_option_context_parse(context, &argc, &argv, &error); | |
| 1429 | |
| 2412 | 1430 if (error != NULL) |
| 1431 { | |
|
2938
1cdfc508d758
Fix adding files when Audacious is running.
Jonathan Schleifer <js@h3c.de>
parents:
2914
diff
changeset
|
1432 g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"), |
|
1cdfc508d758
Fix adding files when Audacious is running.
Jonathan Schleifer <js@h3c.de>
parents:
2914
diff
changeset
|
1433 argv[0], error->message, argv[0]); |
| 2412 | 1434 exit(EXIT_FAILURE); |
| 1435 } | |
| 1436 | |
| 2313 | 1437 if (!gtk_init_check_ok) { |
| 1438 if (argc < 2) { | |
| 1439 /* GTK check failed, and no arguments passed to indicate | |
| 1440 that user is intending to only remote control a running | |
| 1441 session */ | |
| 2412 | 1442 g_printerr(_("%s: Unable to open display, exiting.\n"), argv[0]); |
| 2313 | 1443 exit(EXIT_FAILURE); |
| 1444 } | |
| 1445 | |
| 1446 handle_cmd_line_options(&options, TRUE); | |
| 1447 | |
| 1448 /* we could be running headless, so GTK probably wont matter */ | |
| 1449 if (options.headless != 1) | |
|
2938
1cdfc508d758
Fix adding files when Audacious is running.
Jonathan Schleifer <js@h3c.de>
parents:
2914
diff
changeset
|
1450 exit(EXIT_SUCCESS); |
| 2313 | 1451 } |
| 1452 | |
| 1453 if (options.no_log == FALSE) | |
| 1454 bmp_setup_logger(); | |
| 1455 | |
| 1456 signal_handlers_init(); | |
| 1457 | |
| 1458 g_random_set_seed(time(NULL)); | |
| 1459 | |
| 1460 bmp_config_load(); | |
| 1461 | |
|
2856
c4d07471f647
Added a mowgli_init() call
Cristi Magherusan <majeru@gentoo.ro>
parents:
2846
diff
changeset
|
1462 mowgli_init(); |
|
3306
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1463 |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1464 if (options.headless != 1) |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1465 { |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1466 /* UIManager |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1467 NOTE: this needs to be called before plugin init, cause |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1468 plugin init functions may want to add custom menu entries */ |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1469 ui_manager_init(); |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1470 ui_manager_create_menus(); |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1471 } |
|
404ffedef3e1
added support for plugin-customizable menus; plugins can add their own entries (and even submenus) in main and playlist popup menus
Giacomo Lozito <james@develia.org>
parents:
3296
diff
changeset
|
1472 |
| 2313 | 1473 plugin_system_init(); |
| 1474 | |
| 1475 /* Initialize the playlist system. */ | |
| 1476 playlist_init(); | |
|
3883
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1477 playlist = playlist_get_active(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1478 playlist_load(playlist, bmp_paths[BMP_PATH_PLAYLIST_FILE]); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1479 playlist_set_position(playlist, cfg.playlist_position); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1480 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1481 handle_cmd_line_options(&options, TRUE); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1482 |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1483 #ifdef USE_DBUS |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1484 init_dbus(); |
|
6aaf5476b765
commandline handling rewrite. should be fine, it passed all of my tests. ;)
William Pitcock <nenolod@atheme.org>
parents:
3753
diff
changeset
|
1485 #endif |
| 2313 | 1486 |
| 1487 if (options.headless != 1) | |
| 1488 { | |
| 1489 /* register icons in stock */ | |
| 1490 register_aud_stock_icons(); | |
| 1491 | |
| 1492 bmp_set_default_icon(); | |
|
3525
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1493 #ifdef GDK_WINDOWING_QUARTZ |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1494 set_dock_icon(); |
|
540e49d1d87c
macos: Set an application icon in the dock.
William Pitcock <nenolod@atheme.org>
parents:
3400
diff
changeset
|
1495 #endif |
| 2313 | 1496 |
| 1497 gtk_accel_map_load(bmp_paths[BMP_PATH_ACCEL_FILE]); | |
| 1498 | |
| 1499 if (!init_skins(cfg.skin)) { | |
| 1500 run_load_skin_error_dialog(cfg.skin); | |
| 1501 exit(EXIT_FAILURE); | |
| 1502 } | |
| 1503 | |
| 1504 GDK_THREADS_ENTER(); | |
| 1505 } | |
| 1506 | |
|
3480
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1507 /* Load extra playlists */ |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1508 if(!dir_foreach(bmp_paths[BMP_PATH_PLAYLISTS_DIR], load_extra_playlist, |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1509 playlist, NULL)) { |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1510 g_warning("Could not load extra playlists\n"); |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1511 } |
|
3f4ad59a5c02
Load extra playlists on startup
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3443
diff
changeset
|
1512 |
| 2313 | 1513 /* this needs to be called after all 3 windows are created and |
| 1514 * input plugins are setup'ed | |
| 1515 * but not if we're running headless --nenolod | |
| 1516 */ | |
| 1517 mainwin_setup_menus(); | |
| 1518 | |
| 1519 if (options.headless != 1) | |
| 1520 { | |
|
3678
e82ad057d1db
Get rid of read_volume() craq. Add ui_main_set_initial_volume() to replace the only necessary remaining code.
William Pitcock <nenolod@atheme.org>
parents:
3543
diff
changeset
|
1521 ui_main_set_initial_volume(); |
| 2313 | 1522 |
| 1523 /* FIXME: delayed, because it deals directly with the plugin | |
| 1524 * interface to set menu items */ | |
| 1525 create_prefs_window(); | |
| 1526 | |
| 2364 | 1527 create_fileinfo_window(); |
| 1528 | |
| 2313 | 1529 |
| 1530 if (cfg.player_visible) | |
| 1531 mainwin_show(TRUE); | |
| 1532 else if (!cfg.playlist_visible && !cfg.equalizer_visible) | |
|
2651
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
1533 { |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
1534 /* all of the windows are hidden... warn user about this */ |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
1535 mainwin_show_visibility_warning(); |
|
4d5e6a8717dd
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
giacomo
parents:
2644
diff
changeset
|
1536 } |
| 2313 | 1537 |
| 1538 if (cfg.equalizer_visible) | |
| 1539 equalizerwin_show(TRUE); | |
| 1540 | |
| 1541 if (cfg.playlist_visible) | |
| 1542 playlistwin_show(); | |
| 1543 | |
| 1544 hint_set_always(cfg.always_on_top); | |
| 1545 | |
| 1546 playlist_start_get_info_thread(); | |
| 1547 | |
| 2364 | 1548 has_x11_connection = TRUE; |
| 2313 | 1549 |
| 2364 | 1550 if (cfg.resume_playback_on_startup) |
| 1551 { | |
| 1552 if (cfg.resume_playback_on_startup_time != -1 && | |
| 1553 playlist_get_length(playlist) > 0) | |
| 1554 { | |
| 1555 int i; | |
| 1556 gint l = 0, r = 0; | |
| 1557 while (gtk_events_pending()) gtk_main_iteration(); | |
| 1558 output_get_volume(&l, &r); | |
| 1559 output_set_volume(0,0); | |
| 1560 playback_initiate(); | |
| 2313 | 1561 |
| 2364 | 1562 /* Busy wait; loop is fairly tight to minimize duration of |
| 1563 * "frozen" GUI. Feel free to tune. --chainsaw */ | |
| 1564 for (i = 0; i < 20; i++) | |
| 1565 { | |
| 1566 g_usleep(1000); | |
| 1567 if (!ip_data.playing) | |
| 1568 break; | |
| 1569 } | |
| 1570 playback_seek(cfg.resume_playback_on_startup_time / 1000); | |
| 1571 output_set_volume(l, r); | |
| 1572 } | |
| 1573 } | |
| 1574 | |
| 2313 | 1575 gtk_main(); |
| 1576 | |
| 1577 GDK_THREADS_LEAVE(); | |
| 1578 | |
| 1579 g_cond_free(cond_scan); | |
| 1580 g_mutex_free(mutex_scan); | |
| 1581 | |
| 1582 return EXIT_SUCCESS; | |
| 1583 } | |
| 2364 | 1584 // if we are running headless |
| 2313 | 1585 else |
| 1586 { | |
|
2506
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1587 GMainLoop *loop; |
| 2369 | 1588 |
| 2313 | 1589 playlist_start_get_info_thread(); |
| 1590 | |
|
2506
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1591 loop = g_main_loop_new(NULL, TRUE); |
|
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1592 g_timeout_add(10, aud_headless_iteration, NULL); |
|
630910fd140f
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me)
mf0102
parents:
2475
diff
changeset
|
1593 g_main_loop_run(loop); |
| 2313 | 1594 |
| 1595 return EXIT_SUCCESS; | |
| 1596 } | |
| 1597 } |
