itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --retry command line option 

As a developper, I find it annoying to restart pavucontrol everytime I restart
pulseaudio, moreover the error dialog sometimes needs an additional click
before restarting.
Add it as a command line option so that default behavior is not changed.
This commit is contained in:
Frédéric Dalleau 2012-06-22 11:03:08 +02:00 committed by Tanu Kaskinen
parent fb278932a4
commit ba868cc0b0
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pavucontrol.cc
View File

@ -46,6 +46,7 @@ static pa_context* context = NULL;
static pa_mainloop_api* api = NULL; static pa_mainloop_api* api = NULL;
static int n_outstanding = 0; static int n_outstanding = 0;
static int default_tab = 0; static int default_tab = 0;
static bool retry = false;
static int reconnect_timeout = 1; static int reconnect_timeout = 1;
void show_error(const char *txt) { void show_error(const char *txt) {
@ -621,8 +622,14 @@ gboolean connect_to_pulse(gpointer userdata) {
reconnect_timeout = 5; reconnect_timeout = 5;
} }
else { else {
reconnect_timeout = -1; if(!retry) {
Gtk::Main::quit(); reconnect_timeout = -1;
Gtk::Main::quit();
} else {
g_debug(_("Connection failed, attempting reconnect"));
reconnect_timeout = 5;
g_timeout_add_seconds(reconnect_timeout, connect_to_pulse, w);
}
} }
} }
@ -651,6 +658,12 @@ int main(int argc, char *argv[]) {
entry.set_description(_("Select a specific tab on load.")); entry.set_description(_("Select a specific tab on load."));
group.add_entry(entry, default_tab); group.add_entry(entry, default_tab);
Glib::OptionEntry entry2;
entry2.set_long_name("retry");
entry2.set_short_name('r');
entry2.set_description(_("Retry forever if pa quits (every 5 seconds)."));
group.add_entry(entry2, retry);
options.set_main_group(group); options.set_main_group(group);
try { try {