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