[Goodies-commits] r6934 - in xfce4-radio-plugin/trunk: . icons panel-plugin
Stefan Ott
cockroach at xfce.org
Wed Mar 18 02:45:10 CET 2009
Author: cockroach
Date: 2009-03-18 01:45:09 +0000 (Wed, 18 Mar 2009)
New Revision: 6934
Modified:
xfce4-radio-plugin/trunk/NEWS
xfce4-radio-plugin/trunk/icons/Makefile.am
xfce4-radio-plugin/trunk/panel-plugin/v4l1.c
xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
Log:
Fixed a weird calculation oddness in gnomeradio's code - let's hope there was no particular reason for that (sure)
Modified: xfce4-radio-plugin/trunk/NEWS
===================================================================
--- xfce4-radio-plugin/trunk/NEWS 2009-03-18 01:18:30 UTC (rev 6933)
+++ xfce4-radio-plugin/trunk/NEWS 2009-03-18 01:45:09 UTC (rev 6934)
@@ -5,6 +5,8 @@
=====================
* The "stop facing the wrong direction"-release
* The plugin now behaves when the panel orientation changes
+ * Made synchronizing state with the card optional
+ * Can now show the current preset's name in label instead of the frequency
v0.4.1 (19 Jan 2009):
=====================
Modified: xfce4-radio-plugin/trunk/icons/Makefile.am
===================================================================
--- xfce4-radio-plugin/trunk/icons/Makefile.am 2009-03-18 01:18:30 UTC (rev 6933)
+++ xfce4-radio-plugin/trunk/icons/Makefile.am 2009-03-18 01:45:09 UTC (rev 6934)
@@ -1,7 +1,7 @@
hicolor48dir = $(datadir)/icons/hicolor/48x48/apps
hicolor48_DATA = \
- xfce-radio.png \
+ xfce-radio.png
+
+EXTRA_DIST = $(hicolor48_DATA) \
signal.xpm
-
-EXTRA_DIST = $(hicolor48_DATA)
Modified: xfce4-radio-plugin/trunk/panel-plugin/v4l1.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/v4l1.c 2009-03-18 01:18:30 UTC (rev 6933)
+++ xfce4-radio-plugin/trunk/panel-plugin/v4l1.c 2009-03-18 01:45:09 UTC (rev 6934)
@@ -73,7 +73,9 @@
if (dev->fd<0)
return;
- ifreq = (freq+1.0/32)*dev->freq_fact;
+ //wtf?
+ //ifreq = (freq+1.0/32)*dev->freq_fact;
+ ifreq = freq * dev->freq_fact;
#if 0
printf("Setting to %i (= %.2f)\n", ifreq, freq);
#endif
@@ -161,7 +163,7 @@
perror ("VIDIOCGFREQ");
return -1;
}
-
+ printf ("%d %f\n", freq, freq);
return freq / (double) dev->freq_fact;
}
Modified: xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c 2009-03-18 01:18:30 UTC (rev 6933)
+++ xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c 2009-03-18 01:45:09 UTC (rev 6934)
@@ -279,6 +279,8 @@
gtk_tooltips_enable (data->tooltips);
data->on = TRUE;
}
+ double ff = radio_get_freq ();
+ DBG ("FREQ=%f", ff);
data->freq = radio_get_freq () * 100;
DBG ("Updating frequency to %d", data->freq);
}
@@ -306,7 +308,7 @@
{
DBG("Starting %s", data->device);
- if (!radio_init (data->device, DRIVER_ANY))
+ if (!radio_init (data->device, DRIVER_V4L2))
{
DBG ("Failed!");
GtkWindow* win = GTK_WINDOW (gtk_widget_get_toplevel(
More information about the Goodies-commits
mailing list