Mercurial > audlegacy
annotate audacious/main.c @ 2026:f15664434382 trunk
[svn] rewrite scan thread with g_cond_wait():
- new scan thread is completely event driven.
- reduce playlist update latency.
- no need for periodical execution.
author | yaz |
---|---|
date | Thu, 30 Nov 2006 03:16:08 -0800 |
parents | d3a62e1075e2 |
children | 4f750b8d0127 |
rev | line source |
---|---|
680
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
1 /* Audacious - Cross-platform multimedia player |
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
2 * Copyright (C) 2005-2006 Audacious development team. |
197
ccd034857702
[svn] Split up generic events into audcore_generic_events(), and client-specific stuff remains in mainwin_idle_func().
nenolod
parents:
196
diff
changeset
|
3 * |
ccd034857702
[svn] Split up generic events into audcore_generic_events(), and client-specific stuff remains in mainwin_idle_func().
nenolod
parents:
196
diff
changeset
|
4 * Based on BMP: |
0 | 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 | |
12 * the Free Software Foundation; either version 2 of the License, or | |
13 * (at your option) any later version. | |
14 * | |
15 * This program is distributed in the hope that it will be useful, | |
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 * GNU General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU General Public License | |
21 * along with this program; if not, write to the Free Software | |
1459 | 22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
0 | 23 */ |
24 | |
25 #ifdef HAVE_CONFIG_H | |
26 # include "config.h" | |
27 #endif | |
28 | |
29 #include "main.h" | |
30 | |
31 #include <glib.h> | |
32 #include <glib/gi18n.h> | |
33 #include <glib/gprintf.h> | |
34 #include <gdk/gdk.h> | |
35 #include <stdlib.h> | |
36 #include <string.h> | |
37 #include <getopt.h> | |
38 #include <ctype.h> | |
39 #include <time.h> | |
40 | |
41 #include <unistd.h> | |
42 #include <errno.h> | |
43 #include <sys/types.h> | |
44 #include <sys/stat.h> | |
45 #include <signal.h> | |
1640 | 46 |
47 #include "platform/smartinclude.h" | |
0 | 48 |
49 #include "libaudacious/configdb.h" | |
50 #include "libaudacious/beepctrl.h" | |
51 #include "libaudacious/util.h" | |
52 #include "libaudacious/vfs.h" | |
53 | |
54 #include "controlsocket.h" | |
55 #include "dnd.h" | |
56 #include "effect.h" | |
1653 | 57 #include "equalizer.h" |
0 | 58 #include "general.h" |
197
ccd034857702
[svn] Split up generic events into audcore_generic_events(), and client-specific stuff remains in mainwin_idle_func().
nenolod
parents:
196
diff
changeset
|
59 #include "genevent.h" |
0 | 60 #include "hints.h" |
61 #include "input.h" | |
62 #include "logger.h" | |
1653 | 63 #include "mainwin.h" |
0 | 64 #include "output.h" |
538
e4e897d20791
[svn] remove libaudcore, we never did anything with it
nenolod
parents:
534
diff
changeset
|
65 #include "playback.h" |
0 | 66 #include "playlist.h" |
1653 | 67 #include "ui_playlist.h" |
0 | 68 #include "pluginenum.h" |
69 #include "prefswin.h" | |
70 #include "skinwin.h" | |
71 #include "util.h" | |
72 #include "visualization.h" | |
530
1947144093bc
[svn] When running SVN, make a note of the SVN version. The SVN version is stored in build_stamp.c.
nenolod
parents:
486
diff
changeset
|
73 #include "build_stamp.h" |
1264 | 74 #include "ui_fileinfo.h" |
0 | 75 |
76 #include "pixmaps.h" | |
120 | 77 #include "images/audacious_player.xpm" |
0 | 78 |
680
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
79 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ |
0 | 80 |
81 /* Translatable string for beep.desktop's comment field */ | |
85
8c8a20f72ace
[svn] s/static GTKItemFactoryEntry/GTKItemFactoryEntry/g.
nenolod
parents:
80
diff
changeset
|
82 const gchar *desktop_comment = N_("Audacious"); |
0 | 83 |
85
8c8a20f72ace
[svn] s/static GTKItemFactoryEntry/GTKItemFactoryEntry/g.
nenolod
parents:
80
diff
changeset
|
84 const gchar *application_name = N_("Audacious"); |
0 | 85 |
1653 | 86 |
0 | 87 struct _BmpCmdLineOpt { |
88 GList *filenames; | |
89 gint session; | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
90 gboolean play, stop, pause, fwd, rew, play_pause, playcd, show_jump_box; |
0 | 91 gboolean enqueue, mainwin, remote, activate; |
92 gboolean load_skins; | |
191 | 93 gboolean headless; |
1348
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
94 gboolean no_log; |
0 | 95 gchar *previous_session_id; |
96 }; | |
97 | |
98 typedef struct _BmpCmdLineOpt BmpCmdLineOpt; | |
99 | |
781
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
100 BmpCmdLineOpt options; |
0 | 101 |
102 BmpConfig cfg; | |
103 | |
104 BmpConfig bmp_default_config = { | |
105 MAINWIN_DEFAULT_POS_X, /* mainwin x position */ | |
106 MAINWIN_DEFAULT_POS_Y, /* mainwin y position */ | |
107 EQUALIZER_DEFAULT_POS_X, /* equalizer x position */ | |
108 EQUALIZER_DEFAULT_POS_Y, /* equalizer y position */ | |
109 PLAYLISTWIN_DEFAULT_POS_X, /* playlistwin x position */ | |
110 PLAYLISTWIN_DEFAULT_POS_Y, /* playlistwin y position */ | |
111 PLAYLISTWIN_DEFAULT_WIDTH, /* playlistwin width */ | |
112 PLAYLISTWIN_DEFAULT_HEIGHT, /* playlistwin height */ | |
113 10, /* snap distance */ | |
114 FALSE, /* real-time priority */ | |
115 FALSE, FALSE, /* shuffle, repeat */ | |
116 FALSE, /* UNUSED (double size) */ | |
117 TRUE, /* autoscroll */ | |
118 TRUE, /* analyzer peaks */ | |
119 FALSE, /* equalizer autoload */ | |
120 FALSE, /* easy move */ | |
121 FALSE, /* equalizer active */ | |
122 FALSE, /* playlistwin visible */ | |
123 FALSE, /* equalizer visible */ | |
124 TRUE, /* player visible */ | |
125 FALSE, /* player shaded */ | |
126 FALSE, /* playlistwin shaded */ | |
127 FALSE, /* equalizer shaded */ | |
128 FALSE, /* allow multiple instances */ | |
129 TRUE, /* always show cb */ | |
2019
d3a62e1075e2
[svn] Allow \ to / conversion to be switched on & off, by external contributor Chris Kehler <cbkehler@sympatico.ca>.
chainsaw
parents:
2003
diff
changeset
|
130 TRUE, TRUE, TRUE, /* convert '_', %20 and '\' */ |
0 | 131 TRUE, /* show numbers in playlist */ |
132 TRUE, /* snap windows */ | |
133 TRUE, /* save window positions */ | |
134 TRUE, /* dim titlebar */ | |
135 FALSE, /* get playlist info on load */ | |
136 TRUE, /* get playlist info on demand */ | |
137 TRUE, /* UNUSED (equalizer doublesize linked) */ | |
138 FALSE, /* sort jump to file */ | |
139 FALSE, /* use effect plugins */ | |
140 FALSE, /* always on top */ | |
141 FALSE, /* sticky */ | |
142 FALSE, /* no playlist advance */ | |
1884 | 143 FALSE, /* stop after current song */ |
893
6afdd0d7e1e1
[svn] Make refreshing optional, default to disabled if Gnome VFS available.
nemo
parents:
887
diff
changeset
|
144 TRUE, /* refresh file list */ |
0 | 145 TRUE, /* UNUSED (smooth title scrolling) */ |
146 TRUE, /* use playlist metadata */ | |
147 TRUE, /* warn about unplayables */ | |
148 FALSE, /* use \ as directory delimiter */ | |
149 FALSE, /* random skin on play */ | |
150 FALSE, /* use fontsets */ | |
151 FALSE, /* use X font for mainwin */ | |
152 TRUE, /* use custom cursors */ | |
153 TRUE, /* close dialog on open */ | |
154 TRUE, /* close dialog on add */ | |
155 0.0, /* equalizer preamp */ | |
156 {0, 0, 0, 0, 0, /* equalizer bands */ | |
157 0, 0, 0, 0, 0}, | |
158 NULL, /* skin */ | |
159 NULL, /* output plugin */ | |
160 NULL, /* file selector path */ | |
161 NULL, /* playlist path */ | |
162 NULL, /* playlist font */ | |
163 NULL, /* mainwin font */ | |
164 NULL, /* disabled input plugins */ | |
165 NULL, /* enabled general plugins */ | |
166 NULL, /* enabled visualization plugins */ | |
167 NULL, /* enabled effect plugins */ | |
168 NULL, /* equalizer preset default file */ | |
169 NULL, /* equalizer preset extension */ | |
170 NULL, /* URL history */ | |
171 0, /* timer mode */ | |
172 VIS_ANALYZER, /* visualizer type */ | |
173 ANALYZER_NORMAL, /* analyzer mode */ | |
174 ANALYZER_BARS, /* analyzer type */ | |
175 SCOPE_DOT, /* scope mode */ | |
176 VU_SMOOTH, /* VU mode */ | |
177 REFRESH_FULL, /* visualizer refresh rate */ | |
178 FALLOFF_FAST, /* analyzer fall off rate */ | |
179 FALLOFF_SLOW, /* peaks fall off rate */ | |
180 0, /* playlist position */ | |
181 2, /* pause between songs time */ | |
182 FALSE, /* pause between songs */ | |
183 FALSE, /* show window decorations */ | |
184 8, /* mouse wheel scroll step */ | |
185 FALSE, /* playlist transparent */ | |
1347
8a874906535b
[svn] - use a more standard-looking default title format
nenolod
parents:
1283
diff
changeset
|
186 2, /* 3rd preset (ARTIST - ALBUM - TITLE) */ |
0 | 187 NULL, /* title format */ |
188 FALSE, /* software volume control enabled */ | |
189 TRUE, /* UNUSED (XMMS compatibility mode) */ | |
190 TRUE, /* extra eq filtering */ | |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
191 3, /* scroll pl by */ |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
192 FALSE, /* resume playback on startup */ |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
193 -1, /* resume playback on startup time */ |
1147 | 194 TRUE, /* show seperators in pl */ |
1146
7e208feb36a2
[svn] - new global variable `output_buffer_size', replaces all of the per-plugin buffer sizes
nenolod
parents:
1105
diff
changeset
|
195 NULL, |
7e208feb36a2
[svn] - new global variable `output_buffer_size', replaces all of the per-plugin buffer sizes
nenolod
parents:
1105
diff
changeset
|
196 NULL, |
1163
ff71f891265b
[svn] - Allow to do format detection on demand; instead of immediately on add
nenolod
parents:
1147
diff
changeset
|
197 3000, /* audio buffer size */ |
1164 | 198 FALSE, /* whether or not to postpone format detection on initial add */ |
1358 | 199 TRUE, /* show filepopup for tuple */ |
1413 | 200 NULL, /* words identifying covers */ |
201 NULL, /* words that might not show up in cover names */ | |
1444
c04ce16b2b57
[svn] - libaudacious/beepctrl.c: optimise further and be more paranoid about leaks
nenolod
parents:
1429
diff
changeset
|
202 FALSE, |
c04ce16b2b57
[svn] - libaudacious/beepctrl.c: optimise further and be more paranoid about leaks
nenolod
parents:
1429
diff
changeset
|
203 0, |
c04ce16b2b57
[svn] - libaudacious/beepctrl.c: optimise further and be more paranoid about leaks
nenolod
parents:
1429
diff
changeset
|
204 NULL, /* default session uri base (non-NULL = custom session uri base) */ |
1710 | 205 150, /* short side length of the picture in the filepopup */ |
206 20, /* delay until the filepopup comes up */ | |
1904
4960ba312ffe
[svn] - add a default value for cfg.use_file_cover (FALSE)
nenolod
parents:
1889
diff
changeset
|
207 FALSE, /* use filename.jpg for coverart */ |
1905
6b4116c34489
[svn] - change "Transparency" to "Miscillaneous UI Features" in prefswin
nenolod
parents:
1904
diff
changeset
|
208 FALSE, /* use XMMS-style file selection */ |
0 | 209 }; |
210 | |
211 typedef struct bmp_cfg_boolent_t { | |
212 char const *be_vname; | |
213 gboolean *be_vloc; | |
214 gboolean be_wrt; | |
215 } bmp_cfg_boolent; | |
216 | |
217 typedef struct bmp_cfg_nument_t { | |
218 char const *ie_vname; | |
219 gint *ie_vloc; | |
220 gboolean ie_wrt; | |
221 } bmp_cfg_nument; | |
222 | |
223 typedef struct bmp_cfg_strent_t { | |
224 char const *se_vname; | |
225 char **se_vloc; | |
226 gboolean se_wrt; | |
227 } bmp_cfg_strent; | |
228 | |
229 const gchar *bmp_titlestring_presets[] = { | |
230 "%t", | |
946
8cfe13fcd0c7
[svn] - Forgot a few things regarding titlestrings!
nhjm449
parents:
943
diff
changeset
|
231 "%{p:%p - %}%t", |
8cfe13fcd0c7
[svn] - Forgot a few things regarding titlestrings!
nhjm449
parents:
943
diff
changeset
|
232 "%{p:%p - %}%{a:%a - %}%t", |
943 | 233 "%{p:%p - %}%{a:%a - %}%{n:%n. %}%t", |
234 "%{p:%p %}%{a:[ %a ] %}%{p:- %}%{n:%n. %}%{t:%t%}", | |
946
8cfe13fcd0c7
[svn] - Forgot a few things regarding titlestrings!
nhjm449
parents:
943
diff
changeset
|
235 "%{a:%a - %}%t" |
0 | 236 }; |
237 | |
238 const guint n_titlestring_presets = G_N_ELEMENTS(bmp_titlestring_presets); | |
239 | |
1105
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
240 const gchar *chardet_detector_presets[] = { |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
241 "None", |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
242 "Japanese", |
1595
e6cc84e06444
[svn] - libguess update: workaround for that g_convert can't convert properly from UCS-2BE/LE trailing after BOM.
yaz
parents:
1566
diff
changeset
|
243 "Taiwanese", |
e6cc84e06444
[svn] - libguess update: workaround for that g_convert can't convert properly from UCS-2BE/LE trailing after BOM.
yaz
parents:
1566
diff
changeset
|
244 "Chinese", |
e6cc84e06444
[svn] - libguess update: workaround for that g_convert can't convert properly from UCS-2BE/LE trailing after BOM.
yaz
parents:
1566
diff
changeset
|
245 "Korean", |
1613
9becbe564217
[svn] - chardet patch for Russian language witten by Valentine Sinitsyn.
yaz
parents:
1595
diff
changeset
|
246 "Russian", |
1105
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
247 #ifdef HAVE_UDET |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
248 "Universal" |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
249 #endif |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
250 }; |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
251 |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
252 const guint n_chardet_detector_presets = G_N_ELEMENTS(chardet_detector_presets); |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
253 |
0 | 254 static bmp_cfg_boolent bmp_boolents[] = { |
255 {"allow_multiple_instances", &cfg.allow_multiple_instances, TRUE}, | |
256 {"use_realtime", &cfg.use_realtime, TRUE}, | |
257 {"always_show_cb", &cfg.always_show_cb, TRUE}, | |
258 {"convert_underscore", &cfg.convert_underscore, TRUE}, | |
259 {"convert_twenty", &cfg.convert_twenty, TRUE}, | |
2019
d3a62e1075e2
[svn] Allow \ to / conversion to be switched on & off, by external contributor Chris Kehler <cbkehler@sympatico.ca>.
chainsaw
parents:
2003
diff
changeset
|
260 {"convert_slash", &cfg.convert_slash, TRUE }, |
0 | 261 {"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE}, |
1056
21628529c615
[svn] add the config option to enable/disable separator line in the playlist
yaz
parents:
1042
diff
changeset
|
262 {"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE}, |
0 | 263 {"snap_windows", &cfg.snap_windows, TRUE}, |
264 {"save_window_positions", &cfg.save_window_position, TRUE}, | |
265 {"dim_titlebar", &cfg.dim_titlebar, TRUE}, | |
266 {"get_info_on_load", &cfg.get_info_on_load, TRUE}, | |
267 {"get_info_on_demand", &cfg.get_info_on_demand, TRUE}, | |
1938 | 268 {"eq_doublesize_linked", &cfg.eq_doublesize_linked, TRUE}, |
0 | 269 {"no_playlist_advance", &cfg.no_playlist_advance, TRUE}, |
893
6afdd0d7e1e1
[svn] Make refreshing optional, default to disabled if Gnome VFS available.
nemo
parents:
887
diff
changeset
|
270 {"refresh_file_list", &cfg.refresh_file_list, TRUE}, |
0 | 271 {"sort_jump_to_file", &cfg.sort_jump_to_file, TRUE}, |
272 {"use_pl_metadata", &cfg.use_pl_metadata, TRUE}, | |
273 {"warn_about_unplayables", &cfg.warn_about_unplayables, TRUE}, | |
274 {"use_backslash_as_dir_delimiter", &cfg.use_backslash_as_dir_delimiter, TRUE}, | |
275 {"player_shaded", &cfg.player_shaded, TRUE}, | |
276 {"player_visible", &cfg.player_visible, TRUE}, | |
277 {"shuffle", &cfg.shuffle, TRUE}, | |
278 {"repeat", &cfg.repeat, TRUE}, | |
1938 | 279 {"doublesize", &cfg.doublesize, TRUE}, |
0 | 280 {"autoscroll_songname", &cfg.autoscroll, TRUE}, |
898 | 281 {"stop_after_current_song", &cfg.stopaftersong, TRUE}, |
0 | 282 {"playlist_shaded", &cfg.playlist_shaded, TRUE}, |
283 {"playlist_visible", &cfg.playlist_visible, TRUE}, | |
284 {"playlist_transparent", &cfg.playlist_transparent, TRUE}, | |
285 {"use_fontsets", &cfg.use_fontsets, TRUE}, | |
85
8c8a20f72ace
[svn] s/static GTKItemFactoryEntry/GTKItemFactoryEntry/g.
nenolod
parents:
80
diff
changeset
|
286 {"mainwin_use_xfont", &cfg.mainwin_use_xfont, FALSE}, |
0 | 287 {"equalizer_visible", &cfg.equalizer_visible, TRUE}, |
288 {"equalizer_active", &cfg.equalizer_active, TRUE}, | |
289 {"equalizer_shaded", &cfg.equalizer_shaded, TRUE}, | |
290 {"equalizer_autoload", &cfg.equalizer_autoload, TRUE}, | |
1938 | 291 {"easy_move", &cfg.easy_move, TRUE}, |
0 | 292 {"use_eplugins", &cfg.use_eplugins, TRUE}, |
293 {"always_on_top", &cfg.always_on_top, TRUE}, | |
294 {"sticky", &cfg.sticky, TRUE}, | |
295 {"random_skin_on_play", &cfg.random_skin_on_play, TRUE}, | |
296 {"pause_between_songs", &cfg.pause_between_songs, TRUE}, | |
297 {"show_wm_decorations", &cfg.show_wm_decorations, TRUE}, | |
298 {"eq_extra_filtering", &cfg.eq_extra_filtering, TRUE}, | |
299 {"analyzer_peaks", &cfg.analyzer_peaks, TRUE}, | |
300 {"custom_cursors", &cfg.custom_cursors, TRUE}, | |
301 {"close_dialog_open", &cfg.close_dialog_open, TRUE}, | |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
302 {"close_dialog_add", &cfg.close_dialog_add, TRUE}, |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
303 {"resume_playback_on_startup", &cfg.resume_playback_on_startup, TRUE}, |
1163
ff71f891265b
[svn] - Allow to do format detection on demand; instead of immediately on add
nenolod
parents:
1147
diff
changeset
|
304 {"playlist_detect", &cfg.playlist_detect, TRUE}, |
1358 | 305 {"show_filepopup_for_tuple", &cfg.show_filepopup_for_tuple, TRUE}, |
1889
597bd579d9af
[svn] Patch by Michael Hanselmann to fetch a per-song image file.
nemo
parents:
1886
diff
changeset
|
306 {"recurse_for_cover", &cfg.recurse_for_cover, TRUE}, |
597bd579d9af
[svn] Patch by Michael Hanselmann to fetch a per-song image file.
nemo
parents:
1886
diff
changeset
|
307 {"use_file_cover", &cfg.use_file_cover, TRUE}, |
1905
6b4116c34489
[svn] - change "Transparency" to "Miscillaneous UI Features" in prefswin
nenolod
parents:
1904
diff
changeset
|
308 {"use_xmms_style_fileselector", &cfg.use_xmms_style_fileselector, TRUE}, |
0 | 309 }; |
310 | |
311 static gint ncfgbent = G_N_ELEMENTS(bmp_boolents); | |
312 | |
313 static bmp_cfg_nument bmp_numents[] = { | |
314 {"player_x", &cfg.player_x, TRUE}, | |
315 {"player_y", &cfg.player_y, TRUE}, | |
316 {"timer_mode", &cfg.timer_mode, TRUE}, | |
317 {"vis_type", &cfg.vis_type, TRUE}, | |
318 {"analyzer_mode", &cfg.analyzer_mode, TRUE}, | |
319 {"analyzer_type", &cfg.analyzer_type, TRUE}, | |
320 {"scope_mode", &cfg.scope_mode, TRUE}, | |
321 {"vu_mode", &cfg.vu_mode, TRUE}, | |
322 {"vis_refresh_rate", &cfg.vis_refresh, TRUE}, | |
323 {"analyzer_falloff", &cfg.analyzer_falloff, TRUE}, | |
324 {"peaks_falloff", &cfg.peaks_falloff, TRUE}, | |
325 {"playlist_x", &cfg.playlist_x, TRUE}, | |
326 {"playlist_y", &cfg.playlist_y, TRUE}, | |
327 {"playlist_width", &cfg.playlist_width, TRUE}, | |
328 {"playlist_height", &cfg.playlist_height, TRUE}, | |
329 {"playlist_position", &cfg.playlist_position, TRUE}, | |
330 {"equalizer_x", &cfg.equalizer_x, TRUE}, | |
331 {"equalizer_y", &cfg.equalizer_y, TRUE}, | |
332 {"snap_distance", &cfg.snap_distance, TRUE}, | |
333 {"pause_between_songs_time", &cfg.pause_between_songs_time, TRUE}, | |
334 {"mouse_wheel_change", &cfg.mouse_change, TRUE}, | |
335 {"scroll_pl_by", &cfg.scroll_pl_by, TRUE}, | |
336 {"titlestring_preset", &cfg.titlestring_preset, TRUE}, | |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
337 {"resume_playback_on_startup_time", &cfg.resume_playback_on_startup_time, TRUE}, |
1146
7e208feb36a2
[svn] - new global variable `output_buffer_size', replaces all of the per-plugin buffer sizes
nenolod
parents:
1105
diff
changeset
|
338 {"output_buffer_size", &cfg.output_buffer_size, TRUE}, |
1710 | 339 {"recurse_for_cover_depth", &cfg.recurse_for_cover_depth, TRUE}, |
340 {"filepopup_pixelsize", &cfg.filepopup_pixelsize, TRUE}, | |
341 {"filepopup_delay", &cfg.filepopup_delay, TRUE}, | |
0 | 342 }; |
343 | |
344 static gint ncfgient = G_N_ELEMENTS(bmp_numents); | |
345 | |
346 static bmp_cfg_strent bmp_strents[] = { | |
347 {"playlist_font", &cfg.playlist_font, TRUE}, | |
348 {"mainwin_font", &cfg.mainwin_font, TRUE}, | |
349 {"eqpreset_default_file", &cfg.eqpreset_default_file, TRUE}, | |
350 {"eqpreset_extension", &cfg.eqpreset_extension, TRUE}, | |
351 {"skin", &cfg.skin, FALSE}, | |
352 {"output_plugin", &cfg.outputplugin, FALSE}, | |
353 {"disabled_iplugins", &cfg.disabled_iplugins, TRUE}, | |
354 {"enabled_gplugins", &cfg.enabled_gplugins, FALSE}, | |
355 {"enabled_vplugins", &cfg.enabled_vplugins, FALSE}, | |
356 {"enabled_eplugins", &cfg.enabled_eplugins, FALSE}, | |
357 {"filesel_path", &cfg.filesel_path, FALSE}, | |
358 {"playlist_path", &cfg.playlist_path, FALSE}, | |
359 {"generic_title_format", &cfg.gentitle_format, TRUE}, | |
1105
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
360 {"chardet_detector", &cfg.chardet_detector, TRUE}, |
4be4d74db123
[svn] automatic character encoding detector for id3 metadata. --enable-chardet enables this feature.
yaz
parents:
1068
diff
changeset
|
361 {"chardet_fallback", &cfg.chardet_fallback, TRUE}, |
1413 | 362 {"cover_name_include", &cfg.cover_name_include, TRUE}, |
363 {"cover_name_exclude", &cfg.cover_name_exclude, TRUE}, | |
1444
c04ce16b2b57
[svn] - libaudacious/beepctrl.c: optimise further and be more paranoid about leaks
nenolod
parents:
1429
diff
changeset
|
364 {"session_uri_base", &cfg.session_uri_base, TRUE} |
0 | 365 }; |
366 | |
367 static gint ncfgsent = G_N_ELEMENTS(bmp_strents); | |
368 | |
369 gchar *bmp_paths[BMP_PATH_COUNT] = {}; | |
370 | |
371 GList *dock_window_list = NULL; | |
372 | |
373 gboolean pposition_broken = FALSE; | |
374 | |
486 | 375 gboolean starting_up = TRUE; |
0 | 376 |
1883
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
377 /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */ |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
378 static gchar *pl_candidates[] = { |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
379 PLUGIN_FILENAME("ALSA"), |
1886 | 380 PLUGIN_FILENAME("coreaudio"), |
1883
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
381 PLUGIN_FILENAME("OSS"), |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
382 PLUGIN_FILENAME("sun"), |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
383 PLUGIN_FILENAME("ESD"), |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
384 PLUGIN_FILENAME("pulse_audio"), |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
385 PLUGIN_FILENAME("disk_writer"), |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
386 NULL |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
387 }; |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
388 |
2026 | 389 GCond *cond_scan; |
390 GMutex *mutex_scan; | |
391 | |
0 | 392 static GSList * |
393 get_feature_list(void) | |
394 { | |
395 GSList *features = NULL; | |
396 | |
397 #ifdef HAVE_GCONF | |
398 features = g_slist_append(features, "GConf"); | |
399 #endif | |
400 | |
401 return features; | |
402 } | |
403 | |
404 static void | |
405 dump_version(void) | |
406 { | |
407 GSList *features; | |
408 | |
530
1947144093bc
[svn] When running SVN, make a note of the SVN version. The SVN version is stored in build_stamp.c.
nenolod
parents:
486
diff
changeset
|
409 g_printf("%s %s [%s]", _(application_name), VERSION, svn_stamp); |
0 | 410 |
411 features = get_feature_list(); | |
412 | |
413 if (features) { | |
414 GSList *item; | |
415 | |
416 g_printf(" ("); | |
417 | |
418 for (item = features; g_slist_next(item); item = g_slist_next(item)) | |
419 g_printf("%s, ", (const gchar *) item->data); | |
420 | |
421 g_printf("%s)", (const gchar *) item->data); | |
422 | |
423 g_slist_free(features); | |
424 } | |
425 | |
426 g_printf("\n"); | |
427 } | |
428 | |
429 const gchar * | |
430 xmms_get_gentitle_format(void) | |
431 { | |
625
0a73d1faeb4e
[svn] GCC 4.1 warning fixes by Diego 'Flameeyes' Petteno from Gentoo.
chainsaw
parents:
538
diff
changeset
|
432 guint titlestring_preset = cfg.titlestring_preset; |
0 | 433 |
434 if (titlestring_preset < n_titlestring_presets) | |
435 return bmp_titlestring_presets[titlestring_preset]; | |
436 | |
437 return cfg.gentitle_format; | |
438 } | |
439 | |
887 | 440 void |
0 | 441 make_directory(const gchar * path, mode_t mode) |
442 { | |
443 if (mkdir(path, mode) == 0) | |
444 return; | |
445 | |
446 if (errno == EEXIST) | |
447 return; | |
448 | |
449 g_printerr(_("Could not create directory (%s): %s"), path, | |
450 g_strerror(errno)); | |
451 } | |
452 | |
453 static void | |
454 bmp_make_user_dir(void) | |
455 { | |
456 const mode_t mode755 = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; | |
457 | |
458 make_directory(bmp_paths[BMP_PATH_USER_DIR], mode755); | |
459 make_directory(bmp_paths[BMP_PATH_USER_PLUGIN_DIR], mode755); | |
460 make_directory(bmp_paths[BMP_PATH_USER_SKIN_DIR], mode755); | |
461 make_directory(bmp_paths[BMP_PATH_SKIN_THUMB_DIR], mode755); | |
462 } | |
463 | |
464 static void | |
465 bmp_free_paths(void) | |
466 { | |
467 int i; | |
468 | |
469 for (i = 0; i < BMP_PATH_COUNT; i++) | |
470 { | |
471 g_free(bmp_paths[i]); | |
472 bmp_paths[i] = 0; | |
473 } | |
474 } | |
475 | |
476 | |
477 #define USER_PATH(path) \ | |
478 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], path, NULL); | |
479 | |
480 static void | |
481 bmp_init_paths(void) | |
482 { | |
734 | 483 bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL); |
0 | 484 |
485 bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME); | |
486 bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME); | |
487 bmp_paths[BMP_PATH_SKIN_THUMB_DIR] = USER_PATH(BMP_SKIN_THUMB_DIR_BASENAME); | |
488 bmp_paths[BMP_PATH_CONFIG_FILE] = USER_PATH(BMP_CONFIG_BASENAME); | |
489 bmp_paths[BMP_PATH_PLAYLIST_FILE] = USER_PATH(BMP_PLAYLIST_BASENAME); | |
490 bmp_paths[BMP_PATH_ACCEL_FILE] = USER_PATH(BMP_ACCEL_BASENAME); | |
491 bmp_paths[BMP_PATH_LOG_FILE] = USER_PATH(BMP_LOG_BASENAME); | |
492 | |
493 g_atexit(bmp_free_paths); | |
494 } | |
495 | |
496 | |
497 void | |
498 bmp_config_load(void) | |
499 { | |
500 ConfigDb *db; | |
501 gint i, length; | |
502 | |
503 memcpy(&cfg, &bmp_default_config, sizeof(BmpConfig)); | |
504 | |
505 db = bmp_cfg_db_open(); | |
506 for (i = 0; i < ncfgbent; ++i) { | |
507 bmp_cfg_db_get_bool(db, NULL, | |
508 bmp_boolents[i].be_vname, | |
509 bmp_boolents[i].be_vloc); | |
510 } | |
511 | |
512 for (i = 0; i < ncfgient; ++i) { | |
513 bmp_cfg_db_get_int(db, NULL, | |
514 bmp_numents[i].ie_vname, | |
515 bmp_numents[i].ie_vloc); | |
516 } | |
517 | |
518 for (i = 0; i < ncfgsent; ++i) { | |
519 bmp_cfg_db_get_string(db, NULL, | |
520 bmp_strents[i].se_vname, | |
521 bmp_strents[i].se_vloc); | |
522 } | |
523 | |
524 /* Preset */ | |
525 bmp_cfg_db_get_float(db, NULL, "equalizer_preamp", &cfg.equalizer_preamp); | |
526 for (i = 0; i < 10; i++) { | |
527 gchar eqtext[18]; | |
528 | |
529 g_snprintf(eqtext, sizeof(eqtext), "equalizer_band%d", i); | |
530 bmp_cfg_db_get_float(db, NULL, eqtext, &cfg.equalizer_bands[i]); | |
531 } | |
532 | |
533 /* History */ | |
534 if (bmp_cfg_db_get_int(db, NULL, "url_history_length", &length)) { | |
535 for (i = 1; i <= length; i++) { | |
536 gchar str[19], *tmp; | |
537 | |
538 g_snprintf(str, sizeof(str), "url_history%d", i); | |
539 if (bmp_cfg_db_get_string(db, NULL, str, &tmp)) | |
540 cfg.url_history = g_list_append(cfg.url_history, tmp); | |
541 } | |
542 } | |
543 | |
544 bmp_cfg_db_close(db); | |
545 | |
546 | |
547 if (cfg.playlist_font && strlen(cfg.playlist_font) == 0) { | |
548 g_free(cfg.playlist_font); | |
549 cfg.playlist_font = NULL; | |
550 } | |
551 | |
552 if (cfg.mainwin_font && strlen(cfg.mainwin_font) == 0) { | |
553 g_free(cfg.mainwin_font); | |
554 cfg.mainwin_font = NULL; | |
555 } | |
556 | |
557 if (!cfg.playlist_font) | |
1653 | 558 cfg.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT); |
0 | 559 |
560 if (!cfg.mainwin_font) | |
1653 | 561 cfg.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT); |
0 | 562 |
563 if (!cfg.gentitle_format) | |
1347
8a874906535b
[svn] - use a more standard-looking default title format
nenolod
parents:
1283
diff
changeset
|
564 cfg.gentitle_format = g_strdup("%{p:%p - %}%{a:%a - %}%t"); |
0 | 565 |
566 if (!cfg.outputplugin) { | |
1883
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
567 gint iter; |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
568 gchar *pl_path = g_build_filename(PLUGIN_DIR, plugin_dir_list[0], NULL); |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
569 |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
570 for (iter = 0; pl_candidates[iter] != NULL && cfg.outputplugin == NULL; iter++) |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
571 { |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
572 cfg.outputplugin = find_file_recursively(pl_path, pl_candidates[iter]); |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
573 } |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
574 |
5f0266d393b8
[svn] - try to intelligently choose which output plugin is best. candidates are in an null-terminated array, pl_candidates.
nenolod
parents:
1811
diff
changeset
|
575 g_free(pl_path); |
0 | 576 } |
577 | |
578 if (!cfg.eqpreset_default_file) | |
1653 | 579 cfg.eqpreset_default_file = g_strdup(EQUALIZER_DEFAULT_DIR_PRESET); |
0 | 580 |
581 if (!cfg.eqpreset_extension) | |
1653 | 582 cfg.eqpreset_extension = g_strdup(EQUALIZER_DEFAULT_PRESET_EXT); |
1413 | 583 |
1761
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
584 if (!cfg.chardet_fallback) |
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
585 cfg.chardet_fallback = g_strdup(""); |
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
586 |
1413 | 587 if (!cfg.cover_name_include) |
588 cfg.cover_name_include = g_strdup(""); | |
589 | |
590 if (!cfg.cover_name_exclude) | |
591 cfg.cover_name_exclude = g_strdup("back"); | |
1761
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
592 |
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
593 if (!cfg.session_uri_base) |
70caa62ead63
[svn] - fix for "bmp_rcfile_write_string: assertion `value != NULL' failed"
yaz
parents:
1753
diff
changeset
|
594 cfg.session_uri_base = g_strdup(""); |
0 | 595 } |
596 | |
597 | |
598 void | |
599 bmp_config_save(void) | |
600 { | |
601 GList *node; | |
602 gchar *str; | |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
603 gint i, cur_pb_time; |
0 | 604 ConfigDb *db; |
605 | |
606 cfg.disabled_iplugins = input_stringify_disabled_list(); | |
607 | |
608 | |
609 db = bmp_cfg_db_open(); | |
610 | |
611 for (i = 0; i < ncfgbent; ++i) | |
612 if (bmp_boolents[i].be_wrt) | |
613 bmp_cfg_db_set_bool(db, NULL, | |
614 bmp_boolents[i].be_vname, | |
615 *bmp_boolents[i].be_vloc); | |
616 | |
617 for (i = 0; i < ncfgient; ++i) | |
618 if (bmp_numents[i].ie_wrt) | |
619 bmp_cfg_db_set_int(db, NULL, | |
620 bmp_numents[i].ie_vname, | |
621 *bmp_numents[i].ie_vloc); | |
622 | |
623 /* This is a bit lame .. it'll end up being written twice, | |
624 * could do with being done a bit neater. -larne */ | |
625 bmp_cfg_db_set_int(db, NULL, "playlist_position", | |
626 playlist_get_position()); | |
627 | |
207
e152a92d3f45
[svn] Save the preference to enable or disable bitmap fonts.
nenolod
parents:
198
diff
changeset
|
628 bmp_cfg_db_set_bool(db, NULL, "mainwin_use_xfont", |
e152a92d3f45
[svn] Save the preference to enable or disable bitmap fonts.
nenolod
parents:
198
diff
changeset
|
629 cfg.mainwin_use_xfont); |
e152a92d3f45
[svn] Save the preference to enable or disable bitmap fonts.
nenolod
parents:
198
diff
changeset
|
630 |
0 | 631 for (i = 0; i < ncfgsent; ++i) { |
632 if (bmp_strents[i].se_wrt) | |
633 bmp_cfg_db_set_string(db, NULL, | |
634 bmp_strents[i].se_vname, | |
635 *bmp_strents[i].se_vloc); | |
636 } | |
637 | |
638 bmp_cfg_db_set_float(db, NULL, "equalizer_preamp", cfg.equalizer_preamp); | |
639 | |
640 for (i = 0; i < 10; i++) { | |
641 str = g_strdup_printf("equalizer_band%d", i); | |
642 bmp_cfg_db_set_float(db, NULL, str, cfg.equalizer_bands[i]); | |
643 g_free(str); | |
644 } | |
645 | |
196 | 646 if (bmp_active_skin != NULL) |
647 { | |
648 if (bmp_active_skin->path) | |
649 bmp_cfg_db_set_string(db, NULL, "skin", bmp_active_skin->path); | |
650 else | |
651 bmp_cfg_db_unset_key(db, NULL, "skin"); | |
652 } | |
0 | 653 |
654 if (get_current_output_plugin()) | |
655 bmp_cfg_db_set_string(db, NULL, "output_plugin", | |
656 get_current_output_plugin()->filename); | |
657 else | |
658 bmp_cfg_db_unset_key(db, NULL, "output_plugin"); | |
659 | |
660 str = general_stringify_enabled_list(); | |
661 if (str) { | |
662 bmp_cfg_db_set_string(db, NULL, "enabled_gplugins", str); | |
663 g_free(str); | |
664 } | |
665 else | |
666 bmp_cfg_db_unset_key(db, NULL, "enabled_gplugins"); | |
667 | |
668 str = vis_stringify_enabled_list(); | |
669 if (str) { | |
670 bmp_cfg_db_set_string(db, NULL, "enabled_vplugins", str); | |
671 g_free(str); | |
672 } | |
673 else | |
674 bmp_cfg_db_unset_key(db, NULL, "enabled_vplugins"); | |
675 | |
676 str = effect_stringify_enabled_list(); | |
677 if (str) { | |
678 bmp_cfg_db_set_string(db, NULL, "enabled_eplugins", str); | |
679 g_free(str); | |
680 } | |
681 else | |
682 bmp_cfg_db_unset_key(db, NULL, "enabled_eplugins"); | |
683 | |
684 if (cfg.filesel_path) | |
685 bmp_cfg_db_set_string(db, NULL, "filesel_path", cfg.filesel_path); | |
686 | |
687 if (cfg.playlist_path) | |
688 bmp_cfg_db_set_string(db, NULL, "playlist_path", cfg.playlist_path); | |
689 | |
690 bmp_cfg_db_set_int(db, NULL, "url_history_length", | |
691 g_list_length(cfg.url_history)); | |
692 | |
693 for (node = cfg.url_history, i = 1; node; node = g_list_next(node), i++) { | |
694 str = g_strdup_printf("url_history%d", i); | |
695 bmp_cfg_db_set_string(db, NULL, str, node->data); | |
696 g_free(str); | |
697 } | |
698 | |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
699 if (bmp_playback_get_playing()) { |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
700 cur_pb_time = bmp_playback_get_time(); |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
701 } else |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
702 cur_pb_time = -1; |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
703 cfg.resume_playback_on_startup_time = cur_pb_time; |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
704 bmp_cfg_db_set_int(db, NULL, "resume_playback_on_startup_time", |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
705 cfg.resume_playback_on_startup_time); |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
706 |
0 | 707 bmp_cfg_db_close(db); |
708 | |
1557 | 709 playlist_save(bmp_paths[BMP_PATH_PLAYLIST_FILE]); |
0 | 710 } |
711 | |
712 static void | |
713 bmp_set_default_icon(void) | |
714 { | |
715 GdkPixbuf *icon; | |
716 | |
120 | 717 icon = gdk_pixbuf_new_from_xpm_data((const gchar **) audacious_player_xpm); |
0 | 718 gtk_window_set_default_icon(icon); |
719 g_object_unref(icon); | |
720 } | |
721 | |
722 static void | |
723 display_usage(void) | |
724 { | |
44 | 725 g_print(_("Usage: audacious [options] [files] ...\n\n" |
0 | 726 "Options:\n" |
727 "--------\n")); | |
728 g_print("\n-h, --help "); | |
729 /* -h, --help switch */ | |
730 g_print(_("Display this text and exit")); | |
731 g_print("\n-n, --session "); | |
732 /* -n, --session switch */ | |
257
256b3acc87d4
[svn] Properly report Audacious instead of XMMS or BMP in all places. Patch by laci; closes bug #379.
chainsaw
parents:
216
diff
changeset
|
733 g_print(_("Select Audacious/BMP/XMMS session (Default: 0)")); |
0 | 734 g_print("\n-r, --rew "); |
735 /* -r, --rew switch */ | |
736 g_print(_("Skip backwards in playlist")); | |
737 g_print("\n-p, --play "); | |
738 /* -p, --play switch */ | |
739 g_print(_("Start playing current playlist")); | |
740 g_print("\n-u, --pause "); | |
741 /* -u, --pause switch */ | |
742 g_print(_("Pause current song")); | |
743 g_print("\n-s, --stop "); | |
744 /* -s, --stop switch */ | |
745 g_print(_("Stop current song")); | |
746 g_print("\n-t, --play-pause "); | |
747 /* -t, --play-pause switch */ | |
748 g_print(_("Pause if playing, play otherwise")); | |
749 g_print("\n-f, --fwd "); | |
750 /* -f, --fwd switch */ | |
751 g_print(_("Skip forward in playlist")); | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
752 g_print("\n-j, --show-jump-box "); |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
753 /* -j, --show-jump-box switch */ |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
754 g_print(_("Display Jump to file dialog")); |
0 | 755 g_print("\n-e, --enqueue "); |
756 /* -e, --enqueue switch */ | |
757 g_print(_("Don't clear the playlist")); | |
758 g_print("\n-m, --show-main-window "); | |
759 /* -m, --show-main-window switch */ | |
760 g_print(_("Show the main window")); | |
761 g_print("\n-a, --activate "); | |
762 /* -a, --activate switch */ | |
257
256b3acc87d4
[svn] Properly report Audacious instead of XMMS or BMP in all places. Patch by laci; closes bug #379.
chainsaw
parents:
216
diff
changeset
|
763 g_print(_("Activate Audacious")); |
0 | 764 g_print("\n-i, --sm-client-id "); |
765 /* -i, --sm-client-id switch */ | |
766 g_print(_("Previous session ID")); | |
316
950f104f2e11
[svn] Fix spacing in --help output, patch by Mikachu.
chainsaw
parents:
284
diff
changeset
|
767 g_print("\n-H, --headless "); |
193 | 768 /* -h, --headless switch */ |
769 g_print(_("Headless operation [experimental]")); | |
1348
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
770 g_print("\n-N, --no-log "); |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
771 /* -N, --no-log switch */ |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
772 g_print(_("Disable error/warning interception (logging)")); |
0 | 773 g_print("\n-v, --version "); |
774 /* -v, --version switch */ | |
775 g_print(_("Print version number and exit\n")); | |
776 | |
777 exit(EXIT_SUCCESS); | |
778 } | |
779 | |
780 static void | |
781 parse_cmd_line(gint argc, | |
782 gchar ** argv, | |
783 BmpCmdLineOpt * options) | |
784 { | |
785 static struct option long_options[] = { | |
786 {"help", 0, NULL, 'h'}, | |
787 {"session", 1, NULL, 'n'}, | |
788 {"rew", 0, NULL, 'r'}, | |
789 {"play", 0, NULL, 'p'}, | |
790 {"pause", 0, NULL, 'u'}, | |
791 {"play-pause", 0, NULL, 't'}, | |
792 {"stop", 0, NULL, 's'}, | |
793 {"fwd", 0, NULL, 'f'}, | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
794 {"show-jump-box", 0, NULL, 'j'}, |
0 | 795 {"enqueue", 0, NULL, 'e'}, |
796 {"show-main-window", 0, NULL, 'm'}, | |
797 {"activate", 0, NULL, 'a'}, | |
798 {"version", 0, NULL, 'v'}, | |
799 {"sm-client-id", 1, NULL, 'i'}, | |
800 {"xmms", 0, NULL, 'x'}, | |
191 | 801 {"headless", 0, NULL, 'H'}, |
1348
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
802 {"no-log", 0, NULL, 'N'}, |
0 | 803 {0, 0, 0, 0} |
804 }; | |
805 | |
806 gchar *filename, *current_dir; | |
807 gint c, i; | |
808 | |
809 memset(options, 0, sizeof(BmpCmdLineOpt)); | |
810 options->session = -1; | |
811 | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
812 while ((c = getopt_long(argc, argv, "chn:HrpusfemavtLSj", long_options, |
0 | 813 NULL)) != -1) { |
814 switch (c) { | |
815 case 'h': | |
816 display_usage(); | |
817 break; | |
818 case 'n': | |
819 options->session = atoi(optarg); | |
820 break; | |
191 | 821 case 'H': |
822 options->headless = TRUE; | |
823 break; | |
0 | 824 case 'r': |
825 options->rew = TRUE; | |
826 break; | |
827 case 'p': | |
828 options->play = TRUE; | |
829 break; | |
830 case 'u': | |
831 options->pause = TRUE; | |
832 break; | |
833 case 's': | |
834 options->stop = TRUE; | |
835 break; | |
836 case 'f': | |
837 options->fwd = TRUE; | |
838 break; | |
839 case 't': | |
840 options->play_pause = TRUE; | |
841 break; | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
842 case 'j': |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
843 options->show_jump_box = TRUE; |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
844 break; |
0 | 845 case 'm': |
846 options->mainwin = TRUE; | |
847 break; | |
848 case 'a': | |
849 options->activate = TRUE; | |
850 break; | |
851 case 'e': | |
852 options->enqueue = TRUE; | |
853 break; | |
854 case 'v': | |
855 dump_version(); | |
856 exit(EXIT_SUCCESS); | |
857 break; | |
858 case 'i': | |
859 options->previous_session_id = g_strdup(optarg); | |
860 break; | |
861 case 'c': | |
862 options->playcd = TRUE; | |
863 break; | |
864 case 'S': | |
865 options->load_skins = TRUE; | |
866 break; | |
1348
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
867 case 'N': |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
868 options->no_log = TRUE; |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
869 break; |
0 | 870 } |
871 } | |
872 | |
873 current_dir = g_get_current_dir(); | |
874 | |
875 for (i = optind; i < argc; i++) { | |
876 if (argv[i][0] == '/' || strstr(argv[i], "://")) | |
877 filename = g_strdup(argv[i]); | |
878 else | |
879 filename = g_build_filename(current_dir, argv[i], NULL); | |
880 | |
881 options->filenames = g_list_prepend(options->filenames, filename); | |
882 } | |
883 | |
884 options->filenames = g_list_reverse(options->filenames); | |
885 | |
886 g_free(current_dir); | |
887 } | |
888 | |
889 static void | |
890 handle_cmd_line_options(BmpCmdLineOpt * options, | |
891 gboolean remote) | |
892 { | |
893 GList *filenames = options->filenames; | |
894 gint session = options->session; | |
895 | |
896 if (session == -1) { | |
897 if (!remote) | |
898 session = ctrlsocket_get_session_id(); | |
899 else | |
900 session = 0; | |
901 } | |
902 | |
903 if (filenames) { | |
904 gint pos = 0; | |
905 | |
906 if (options->load_skins) { | |
907 xmms_remote_set_skin(session, filenames->data); | |
908 skin_install_skin(filenames->data); | |
909 } | |
910 else { | |
911 if (options->enqueue && options->play) | |
912 pos = xmms_remote_get_playlist_length(session); | |
913 | |
914 if (!options->enqueue) | |
915 xmms_remote_playlist_clear(session); | |
916 | |
917 xmms_remote_playlist_add(session, filenames); | |
918 | |
919 if (options->enqueue && options->play && | |
920 xmms_remote_get_playlist_length(session) > pos) | |
921 xmms_remote_set_playlist_pos(session, pos); | |
922 | |
923 if (!options->enqueue) | |
924 xmms_remote_play(session); | |
925 } | |
926 | |
927 g_list_foreach(filenames, (GFunc) g_free, NULL); | |
928 g_list_free(filenames); | |
929 } | |
930 | |
931 if (options->rew) | |
932 xmms_remote_playlist_prev(session); | |
933 | |
934 if (options->play) | |
935 xmms_remote_play(session); | |
936 | |
937 if (options->pause) | |
938 xmms_remote_pause(session); | |
939 | |
940 if (options->stop) | |
941 xmms_remote_stop(session); | |
942 | |
943 if (options->fwd) | |
944 xmms_remote_playlist_next(session); | |
945 | |
946 if (options->play_pause) | |
947 xmms_remote_play_pause(session); | |
948 | |
1885
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
949 if (options->show_jump_box) |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
950 xmms_remote_show_jtf_box(session); |
1cd683dd944e
[svn] Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
chainsaw
parents:
1884
diff
changeset
|
951 |
0 | 952 if (options->mainwin) |
953 xmms_remote_main_win_toggle(session, TRUE); | |
954 | |
955 if (options->activate) | |
956 xmms_remote_activate(session); | |
957 | |
958 if (options->playcd) | |
959 play_medium(); | |
960 } | |
961 | |
962 static void | |
963 segfault_handler(gint sig) | |
964 { | |
965 g_printerr(_("\nReceived SIGSEGV\n\n" | |
27
d160ae2251e9
[svn] Update SIGSEGV message, contained the BMP mailing information.
nenolod
parents:
0
diff
changeset
|
966 "This could be a bug in Audacious. If you don't know why this happened, " |
1959 | 967 "file a bug at http://bugs-meta.atheme.org/\n\n")); |
0 | 968 #ifdef HANDLE_SIGSEGV |
969 exit(EXIT_FAILURE); | |
970 #else | |
971 abort(); | |
972 #endif | |
973 } | |
974 | |
975 static void | |
976 bmp_setup_logger(void) | |
977 { | |
978 if (!bmp_logger_start(bmp_paths[BMP_PATH_LOG_FILE])) | |
979 return; | |
980 | |
981 g_atexit(bmp_logger_stop); | |
982 } | |
983 | |
984 static void | |
985 run_load_skin_error_dialog(const gchar * skin_path) | |
986 { | |
987 const gchar *markup = | |
988 N_("<b><big>Unable to load skin.</big></b>\n" | |
989 "\n" | |
990 "Check that skin at '%s' is usable and default skin is properly " | |
991 "installed at '%s'\n"); | |
992 | |
993 GtkWidget *dialog = | |
994 gtk_message_dialog_new_with_markup(NULL, | |
995 GTK_DIALOG_MODAL, | |
996 GTK_MESSAGE_ERROR, | |
997 GTK_BUTTONS_CLOSE, | |
998 _(markup), | |
999 skin_path, | |
1000 BMP_DEFAULT_SKIN_PATH); | |
1001 gtk_dialog_run(GTK_DIALOG(dialog)); | |
1002 gtk_widget_destroy(dialog); | |
1003 } | |
1004 | |
781
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1005 // use a format string? |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1006 void report_error(const gchar *error_text) |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1007 { |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1008 fprintf(stderr,error_text); |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1009 if (options.headless!=1) { |
813
c8cf439179b8
[svn] - Fix a ton and a half of memory leaks, via the wonderful Leonardo Boshell <leonardop -at- gentoo.org>.
nenolod
parents:
781
diff
changeset
|
1010 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(err), |
c8cf439179b8
[svn] - Fix a ton and a half of memory leaks, via the wonderful Leonardo Boshell <leonardop -at- gentoo.org>.
nenolod
parents:
781
diff
changeset
|
1011 error_text); |
781
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1012 gtk_dialog_run(GTK_DIALOG(err)); |
813
c8cf439179b8
[svn] - Fix a ton and a half of memory leaks, via the wonderful Leonardo Boshell <leonardop -at- gentoo.org>.
nenolod
parents:
781
diff
changeset
|
1013 gtk_widget_hide(err); |
781
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1014 } |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1015 } |
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1016 |
0 | 1017 gint |
1018 main(gint argc, gchar ** argv) | |
1019 { | |
44 | 1020 gboolean gtk_init_check_ok; |
0 | 1021 |
1022 /* Setup l10n early so we can print localized error messages */ | |
1023 gtk_set_locale(); | |
749 | 1024 bindtextdomain(PACKAGE_NAME, LOCALEDIR); |
1025 bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); | |
1026 textdomain(PACKAGE_NAME); | |
0 | 1027 |
1028 bmp_init_paths(); | |
1029 bmp_make_user_dir(); | |
1030 | |
1031 /* Check GTK version. Really, this is only needed for binary | |
1032 * distribution since configure already checks. */ | |
680
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
1033 if (!GTK_CHECK_VERSION(2, 6, 0)) { |
257
256b3acc87d4
[svn] Properly report Audacious instead of XMMS or BMP in all places. Patch by laci; closes bug #379.
chainsaw
parents:
216
diff
changeset
|
1034 g_printerr(_("Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" |
0 | 1035 "Please use GTK+ %s or newer.\n"), |
1036 gtk_major_version, gtk_minor_version, gtk_micro_version, | |
680
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
1037 "2.6.0"); |
0 | 1038 exit(EXIT_FAILURE); |
1039 } | |
1040 | |
1041 g_set_application_name(_(application_name)); | |
1042 | |
1043 g_thread_init(NULL); | |
1044 if (!g_thread_supported()) { | |
1045 g_printerr(_("Sorry, threads isn't supported on your platform.\n\n" | |
1046 "If you're on a libc5 based linux system and installed Glib & GTK+ before you\n" | |
1047 "installed LinuxThreads you need to recompile Glib & GTK+.\n")); | |
1048 exit(EXIT_FAILURE); | |
1049 } | |
1050 | |
1051 gdk_threads_init(); | |
1052 | |
2026 | 1053 cond_scan = g_cond_new(); |
1054 mutex_scan = g_mutex_new(); | |
1055 | |
44 | 1056 gtk_init_check_ok = gtk_init_check(&argc, &argv); |
1057 /* Now let's parse the command line options first. */ | |
1058 parse_cmd_line(argc, argv, &options); | |
1059 if (!gtk_init_check_ok) { | |
0 | 1060 if (argc < 2) { |
1061 /* GTK check failed, and no arguments passed to indicate | |
1062 that user is intending to only remote control a running | |
1063 session */ | |
44 | 1064 g_printerr(_("audacious: Unable to open display, exiting.\n")); |
0 | 1065 exit(EXIT_FAILURE); |
1066 } | |
1067 | |
1068 handle_cmd_line_options(&options, TRUE); | |
191 | 1069 |
1070 /* we could be running headless, so GTK probably wont matter */ | |
1071 if (options.headless != 1) | |
1072 exit(EXIT_SUCCESS); | |
0 | 1073 } |
1074 | |
1348
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
1075 if (options.no_log == FALSE) |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
1076 bmp_setup_logger(); |
cc57f7545876
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)
nenolod
parents:
1347
diff
changeset
|
1077 |
0 | 1078 signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */ |
1079 signal(SIGSEGV, segfault_handler); | |
1080 | |
1081 g_random_set_seed(time(NULL)); | |
1082 | |
1083 bmp_config_load(); | |
1084 | |
1085 if (options.session != -1 || !ctrlsocket_setup()) { | |
1086 handle_cmd_line_options(&options, TRUE); | |
1087 exit(EXIT_SUCCESS); | |
1088 } | |
1089 | |
2003
74f280120233
[svn] - init plugins before initalizing the skin system.
nenolod
parents:
2000
diff
changeset
|
1090 plugin_system_init(); |
74f280120233
[svn] - init plugins before initalizing the skin system.
nenolod
parents:
2000
diff
changeset
|
1091 |
191 | 1092 if (options.headless != 1) |
1093 { | |
781
12c47704b4b5
[svn] Add error reporting for many places, patch by external contributor Derek
nenolod
parents:
749
diff
changeset
|
1094 |
191 | 1095 bmp_set_default_icon(); |
0 | 1096 |
191 | 1097 gtk_accel_map_load(bmp_paths[BMP_PATH_ACCEL_FILE]); |
0 | 1098 |
1810 | 1099 if (!init_skins(cfg.skin)) { |
1100 run_load_skin_error_dialog(cfg.skin); | |
1101 exit(EXIT_FAILURE); | |
1102 } | |
1103 | |
191 | 1104 GDK_THREADS_ENTER(); |
0 | 1105 } |
1106 | |
1107 playlist_load(bmp_paths[BMP_PATH_PLAYLIST_FILE]); | |
1108 playlist_set_position(cfg.playlist_position); | |
1109 | |
1110 /* this needs to be called after all 3 windows are created and | |
191 | 1111 * input plugins are setup'ed |
1112 * but not if we're running headless --nenolod | |
1113 */ | |
0 | 1114 mainwin_setup_menus(); |
1115 | |
191 | 1116 if (options.headless != 1) |
1117 GDK_THREADS_LEAVE(); | |
0 | 1118 |
1119 ctrlsocket_start(); | |
1120 | |
1121 handle_cmd_line_options(&options, FALSE); | |
1122 | |
191 | 1123 if (options.headless != 1) |
1124 { | |
1125 GDK_THREADS_ENTER(); | |
0 | 1126 |
191 | 1127 read_volume(VOLSET_STARTUP); |
1128 mainwin_set_info_text(); | |
1129 | |
1130 /* FIXME: delayed, because it deals directly with the plugin | |
1131 * interface to set menu items */ | |
1132 create_prefs_window(); | |
0 | 1133 |
1264 | 1134 create_fileinfo_window(); |
1283
19b1d3f22e10
[svn] - when hovering over a playlist tuple, describe the tuple via a tooltip-like popup
nenolod
parents:
1264
diff
changeset
|
1135 create_filepopup_window(); |
1264 | 1136 |
191 | 1137 if (cfg.player_visible) |
1138 mainwin_show(TRUE); | |
1139 else if (!cfg.playlist_visible && !cfg.equalizer_visible) | |
1140 mainwin_show(TRUE); | |
125 | 1141 |
191 | 1142 if (cfg.equalizer_visible) |
1143 equalizerwin_show(TRUE); | |
1144 | |
1145 if (cfg.playlist_visible) | |
1146 playlistwin_show(); | |
0 | 1147 |
191 | 1148 hint_set_always(cfg.always_on_top); |
0 | 1149 |
191 | 1150 playlist_start_get_info_thread(); |
1151 mainwin_attach_idle_func(); | |
1152 | |
486 | 1153 starting_up = FALSE; |
1154 | |
680
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
1155 has_x11_connection = TRUE; |
8282b365f6cb
[svn] - Add some sanity checking to make sure we can't do X11 stuff when running headless.
nenolod
parents:
625
diff
changeset
|
1156 |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1157 if (cfg.resume_playback_on_startup) { |
1659
eeaf62b288a3
[svn] Make the playback resume code a lot more robust.
chainsaw
parents:
1653
diff
changeset
|
1158 if (cfg.resume_playback_on_startup_time != -1 && playlist_get_length() > 0) { |
eeaf62b288a3
[svn] Make the playback resume code a lot more robust.
chainsaw
parents:
1653
diff
changeset
|
1159 int i; |
1753
01df1ea5feae
[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
chainsaw
parents:
1710
diff
changeset
|
1160 gint l=0, r=0; |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1161 while (gtk_events_pending()) gtk_main_iteration(); |
1753
01df1ea5feae
[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
chainsaw
parents:
1710
diff
changeset
|
1162 output_get_volume(&l, &r); |
01df1ea5feae
[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
chainsaw
parents:
1710
diff
changeset
|
1163 output_set_volume(0,0); |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1164 bmp_playback_initiate(); |
1966
fcf3900d05b9
[svn] - temporarily display the newui at startup along with the oldui
nenolod
parents:
1959
diff
changeset
|
1165 |
fcf3900d05b9
[svn] - temporarily display the newui at startup along with the oldui
nenolod
parents:
1959
diff
changeset
|
1166 /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to |
fcf3900d05b9
[svn] - temporarily display the newui at startup along with the oldui
nenolod
parents:
1959
diff
changeset
|
1167 * tune. --chainsaw |
fcf3900d05b9
[svn] - temporarily display the newui at startup along with the oldui
nenolod
parents:
1959
diff
changeset
|
1168 */ |
fcf3900d05b9
[svn] - temporarily display the newui at startup along with the oldui
nenolod
parents:
1959
diff
changeset
|
1169 for (i = 0; i < 20; i++) { |
1753
01df1ea5feae
[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
chainsaw
parents:
1710
diff
changeset
|
1170 g_usleep(1000); |
1659
eeaf62b288a3
[svn] Make the playback resume code a lot more robust.
chainsaw
parents:
1653
diff
changeset
|
1171 if (!ip_data.playing) |
eeaf62b288a3
[svn] Make the playback resume code a lot more robust.
chainsaw
parents:
1653
diff
changeset
|
1172 break; |
eeaf62b288a3
[svn] Make the playback resume code a lot more robust.
chainsaw
parents:
1653
diff
changeset
|
1173 } |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1174 bmp_playback_seek(cfg.resume_playback_on_startup_time / |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1175 1000); |
1753
01df1ea5feae
[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
chainsaw
parents:
1710
diff
changeset
|
1176 output_set_volume(l, r); |
998
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1177 } |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1178 } |
8c6949ffd7f8
[svn] Support for saving the playback state, and resuming playback after restart. Patch by cha0smaster, closes bug #479.
chainsaw
parents:
946
diff
changeset
|
1179 |
191 | 1180 gtk_main(); |
1181 | |
1182 GDK_THREADS_LEAVE(); | |
0 | 1183 |
2026 | 1184 g_cond_free(cond_scan); |
1185 g_mutex_free(mutex_scan); | |
1186 | |
191 | 1187 return EXIT_SUCCESS; |
1188 } | |
1189 else | |
1190 { | |
1191 mainwin_set_info_text(); | |
1192 playlist_start_get_info_thread(); | |
0 | 1193 |
486 | 1194 starting_up = FALSE; |
1195 | |
191 | 1196 for (;;) |
192
0ee0b9b6db7e
[svn] headless now working, use --headless if you wish to experiment.
nenolod
parents:
191
diff
changeset
|
1197 { |
197
ccd034857702
[svn] Split up generic events into audcore_generic_events(), and client-specific stuff remains in mainwin_idle_func().
nenolod
parents:
196
diff
changeset
|
1198 /* headless eventloop */ |
ccd034857702
[svn] Split up generic events into audcore_generic_events(), and client-specific stuff remains in mainwin_idle_func().
nenolod
parents:
196
diff
changeset
|
1199 audcore_generic_events(); |
198 | 1200 free_vis_data(); /* to prevent buffer overflow -- paranoia */ |
191 | 1201 xmms_usleep(10000); |
192
0ee0b9b6db7e
[svn] headless now working, use --headless if you wish to experiment.
nenolod
parents:
191
diff
changeset
|
1202 } |
0ee0b9b6db7e
[svn] headless now working, use --headless if you wish to experiment.
nenolod
parents:
191
diff
changeset
|
1203 |
191 | 1204 return EXIT_SUCCESS; |
1205 } | |
0 | 1206 } |