comparison src/audacious/main.c @ 4517:6e412073cf28

cleaned up some more
author mf0102 <0102@gmx.at>
date Wed, 23 Apr 2008 22:20:35 +0200
parents 246244ead30e
children b3e4f5c31546
comparison
equal deleted inserted replaced
4516:9fbb55542e73 4517:6e412073cf28
87 #endif 87 #endif
88 88
89 #include "icons-stock.h" 89 #include "icons-stock.h"
90 #include "images/audacious_player.xpm" 90 #include "images/audacious_player.xpm"
91 91
92 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ 92 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */
93 const gchar *application_name = N_("Audacious"); 93 static const gchar *application_name = N_("Audacious");
94 94
95 struct _AudCmdLineOpt { 95 struct _AudCmdLineOpt {
96 gchar **filenames; 96 gchar **filenames;
97 gint session; 97 gint session;
98 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box; 98 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box;
106 gboolean macpack; 106 gboolean macpack;
107 }; 107 };
108 108
109 typedef struct _AudCmdLineOpt AudCmdLineOpt; 109 typedef struct _AudCmdLineOpt AudCmdLineOpt;
110 110
111 AudCmdLineOpt options; 111 static AudCmdLineOpt options;
112
113 AudConfig cfg;
114 112
115 const gchar *aud_titlestring_presets[] = { 113 const gchar *aud_titlestring_presets[] = {
116 "${title}", 114 "${title}",
117 "${?artist:${artist} - }${title}", 115 "${?artist:${artist} - }${title}",
118 "${?artist:${artist} - }${?album:${album} - }${title}", 116 "${?artist:${artist} - }${?album:${album} - }${title}",
119 "${?artist:${artist} - }${?album:${album} - }${?track-number:${track-number}. }${title}", 117 "${?artist:${artist} - }${?album:${album} - }${?track-number:${track-number}. }${title}",
120 "${?artist:${artist} }${?album:[ ${album} ] }${?artist:- }${?track-number:${track-number}. }${title}", 118 "${?artist:${artist} }${?album:[ ${album} ] }${?artist:- }${?track-number:${track-number}. }${title}",
121 "${?album:${album} - }${title}" 119 "${?album:${album} - }${title}"
122 }; 120 };
123
124 const guint n_titlestring_presets = G_N_ELEMENTS(aud_titlestring_presets); 121 const guint n_titlestring_presets = G_N_ELEMENTS(aud_titlestring_presets);
125 122
126 const gchar *chardet_detector_presets[] = { 123 const gchar *chardet_detector_presets[] = {
127 N_("None"), 124 N_("None"),
128 N_("Japanese"), 125 N_("Japanese"),
136 N_("Arabic"), 133 N_("Arabic"),
137 #ifdef HAVE_UDET 134 #ifdef HAVE_UDET
138 N_("Universal") 135 N_("Universal")
139 #endif 136 #endif
140 }; 137 };
141 138 const guint n_chardet_detector_presets = G_N_ELEMENTS(chardet_detector_presets);
142 const guint n_chardet_detector_presets = G_N_ELEMENTS(chardet_detector_presets); 139
143 gchar *aud_paths[BMP_PATH_COUNT] = {}; 140 gchar *aud_paths[BMP_PATH_COUNT] = {};
144
145 GList *dock_window_list = NULL;
146
147 141
148 GCond *cond_scan; 142 GCond *cond_scan;
149 GMutex *mutex_scan; 143 GMutex *mutex_scan;
150 #ifdef USE_DBUS 144 #ifdef USE_DBUS
151 MprisPlayer *mpris; 145 MprisPlayer *mpris;