[Goodies-commits] r6578 - xfce4-radio-plugin/trunk/panel-plugin
Stefan Ott
cockroach at xfce.org
Mon Jan 26 23:58:20 CET 2009
Author: cockroach
Date: 2009-01-26 22:58:20 +0000 (Mon, 26 Jan 2009)
New Revision: 6578
Modified:
xfce4-radio-plugin/trunk/panel-plugin/radio.c
xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
Log:
Can now properly stop the radio device when it's turned off (unless 'synchronize state' is selected)
Modified: xfce4-radio-plugin/trunk/panel-plugin/radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/radio.c 2009-01-26 22:27:13 UTC (rev 6577)
+++ xfce4-radio-plugin/trunk/panel-plugin/radio.c 2009-01-26 22:58:20 UTC (rev 6578)
@@ -36,9 +36,15 @@
int radio_init(char *device, DriverType driver)
{
int rv = -1;
- if (dev) {
+ /*
+ * This is a bad idea since consecutive radio_stop and radio_start
+ * will cause bad things to happen
+ */
+ /*
+ if (dev) {
radio_stop();
}
+ */
switch (driver) {
case DRIVER_V4L2:
Modified: xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c 2009-01-26 22:27:13 UTC (rev 6577)
+++ xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c 2009-01-26 22:58:20 UTC (rev 6578)
@@ -304,9 +304,11 @@
static gboolean
xfce4_radio_start (radio_gui* data)
{
- DBG("Starting");
- if (!radio_init (data->device, DRIVER_V4L2))
+ DBG("Starting %s", data->device);
+
+ if (!radio_init (data->device, DRIVER_ANY))
{
+ DBG ("Failed!");
GtkWindow* win = GTK_WINDOW (gtk_widget_get_toplevel(
data->box));
GtkWidget* warn = gtk_message_dialog_new (win, 0,
@@ -329,7 +331,15 @@
static void
xfce4_radio_stop (radio_gui* data)
{
- radio_mute ();
+ DBG("Stopping, auto_update_display=%d", data->auto_update_display);
+
+ if (data->auto_update_display)
+ radio_mute ();
+ else
+ {
+ radio_stop ();
+ }
+
gtk_tooltips_disable (data->tooltips);
if (data->show_signal) gtk_widget_hide (data->signal_bar);
More information about the Goodies-commits
mailing list