comparison src/audacious/main.c @ 4350:8071e599916d

renamed BmpCmdLineOpt to AudCmdLineOpt (greatest commit EVAR! ;-)
author mf0102 <0102@gmx.at>
date Sun, 16 Mar 2008 19:02:57 +0100
parents f493c456c77f
children ac1f6d211223
comparison
equal deleted inserted replaced
4348:225d11441186 4350:8071e599916d
92 #include "images/audacious_player.xpm" 92 #include "images/audacious_player.xpm"
93 93
94 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ 94 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */
95 const gchar *application_name = N_("Audacious"); 95 const gchar *application_name = N_("Audacious");
96 96
97 struct _BmpCmdLineOpt { 97 struct _AudCmdLineOpt {
98 gchar **filenames; 98 gchar **filenames;
99 gint session; 99 gint session;
100 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box; 100 gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box;
101 gboolean enqueue, mainwin, remote, activate; 101 gboolean enqueue, mainwin, remote, activate;
102 gboolean load_skins; 102 gboolean load_skins;
106 gboolean version; 106 gboolean version;
107 gchar *previous_session_id; 107 gchar *previous_session_id;
108 gboolean macpack; 108 gboolean macpack;
109 }; 109 };
110 110
111 typedef struct _BmpCmdLineOpt BmpCmdLineOpt; 111 typedef struct _AudCmdLineOpt AudCmdLineOpt;
112 112
113 BmpCmdLineOpt options; 113 AudCmdLineOpt options;
114 114
115 BmpConfig cfg; 115 BmpConfig cfg;
116 116
117 BmpConfig bmp_default_config = { 117 BmpConfig bmp_default_config = {
118 MAINWIN_DEFAULT_POS_X, /* mainwin x position */ 118 MAINWIN_DEFAULT_POS_X, /* mainwin x position */
1090 drct_play(); 1090 drct_play();
1091 return FALSE; 1091 return FALSE;
1092 } 1092 }
1093 1093
1094 static void 1094 static void
1095 handle_cmd_line_options(BmpCmdLineOpt * options, 1095 handle_cmd_line_options(AudCmdLineOpt * options,
1096 gboolean remote) 1096 gboolean remote)
1097 { 1097 {
1098 gchar **filenames = options->filenames; 1098 gchar **filenames = options->filenames;
1099 #ifdef USE_DBUS 1099 #ifdef USE_DBUS
1100 DBusGProxy *session = audacious_get_dbus_proxy(); 1100 DBusGProxy *session = audacious_get_dbus_proxy();
1398 mutex_scan = g_mutex_new(); 1398 mutex_scan = g_mutex_new();
1399 gtk_rc_add_default_file(bmp_paths[BMP_PATH_GTKRC_FILE]); 1399 gtk_rc_add_default_file(bmp_paths[BMP_PATH_GTKRC_FILE]);
1400 1400
1401 gtk_init_check_ok = gtk_init_check(&argc, &argv); 1401 gtk_init_check_ok = gtk_init_check(&argc, &argv);
1402 1402
1403 memset(&options, '\0', sizeof(BmpCmdLineOpt)); 1403 memset(&options, '\0', sizeof(AudCmdLineOpt));
1404 options.session = -1; 1404 options.session = -1;
1405 1405
1406 context = g_option_context_new(_("- play multimedia files")); 1406 context = g_option_context_new(_("- play multimedia files"));
1407 g_option_context_add_main_entries(context, cmd_entries, PACKAGE_NAME); 1407 g_option_context_add_main_entries(context, cmd_entries, PACKAGE_NAME);
1408 g_option_context_add_group(context, gtk_get_option_group(TRUE)); 1408 g_option_context_add_group(context, gtk_get_option_group(TRUE));