minor refactoring

diff --git a/discovery.c b/discovery.c
index f7d09434012f96d262ede8582d8af83c7d7ec315..6595458ace9a9c7f86515280b22a2391df59fbf6 100644 (file)
--- a/discovery.c
+++ b/discovery.c
@@ -105,9 +105,8 @@ void discovery(void) {
            // TODO: exit?
        }
 
-       if(d->status == STATE_AVAILABLE) {
-           radio=(DISCOVERED *)d;
-           start_radio();
+       if(d != NULL && d->status == STATE_AVAILABLE) {
+           start_radio(d);
        }
     }
 }

diff --git a/protocols.c b/protocols.c
index 0b23f8bf994631f57e03156bb70a409e43327c10..6cf4159d7f1a7a3449bced50b622b1de3b94ad7e 100644 (file)
--- a/protocols.c
+++ b/protocols.c
@@ -52,7 +52,7 @@ void protocols_save_state() {
   
 }
 
-void protocols_restore_state() {
+void protocols_restore_state(void) {
   char *value;
 
   loadProperties("protocols.props");

diff --git a/radio.c b/radio.c
index 6fcb8f3792ea436394c72645b1e1910957639a22..8fe112aaee309e3f15a3185123463dd1cbccb0cb 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -708,11 +708,12 @@ static void create_visual() {
     gtk_widget_show_all(top_window);
 }
 
-void start_radio() {
+void start_radio(DISCOVERED *d) {
     int i;
     gdk_window_set_cursor(gtk_widget_get_window(top_window),
                           gdk_cursor_new(GDK_WATCH));
 
+    radio = d;
     protocol = radio->protocol;
     device = radio->device;
 

diff --git a/radio.h b/radio.h
index 2cc368a4f3b247bd5dc4dd71ce9be712be46edf2..5477a7a8052b9db6be08c16bb551cec82a4d6e9f 100644 (file)
--- a/radio.h
+++ b/radio.h
@@ -331,7 +331,7 @@ extern gboolean server;
 
 extern void radio_stop();
 extern void reconfigure_radio();
-extern void start_radio();
+extern void start_radio(DISCOVERED *);
 //extern void init_radio();
 extern void radio_change_receivers(int r);
 extern void radio_change_sample_rate(int rate);

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 3840937c0349d0d6e6c22ed3d26ad91a891fefa0..1a59e17b49313972a6b92820d377861011a1714f 100644 (file)
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -364,6 +364,10 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "property"
+version = "0.1.0"
+
 [[package]]
 name = "quote"
 version = "1.0.37"