Move RSL file handling to level2 object

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index b45ce1e5583e95d3b4e100b613e2a30c6a94bac3..b61854aa89e61674f88eafa338d72f3c8b674308 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -22,13 +22,7 @@
 #include <rsl.h>
 
 #include <gis.h>
-
-/* TODO: convert */
-typedef struct {
-       char *name;
-       guint8 data[256][4];
-} colormap_t;
-extern colormap_t colormaps[];
+#include "level2.h"
 
 #define GIS_TYPE_PLUGIN_RADAR            (gis_plugin_radar_get_type ())
 #define GIS_PLUGIN_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_RADAR, GisPluginRadar))
@@ -44,23 +38,24 @@ struct _GisPluginRadar {
        GObject parent_instance;
 
        /* instance members */
-       GisViewer   *viewer;
-       GisPrefs    *prefs;
-       GisHttp     *http;
-       GtkWidget   *config_body;
-       GtkWidget   *progress_bar;
-       GtkWidget   *progress_label;
-       guint        time_changed_id;
-       guint        location_changed_id;
-
-       /* Private data for loading radars */
-       GMutex      *load_mutex;
-       char        *cur_site;
-       char        *cur_time;
-       Radar       *cur_radar;
-       Sweep       *cur_sweep;
-       colormap_t  *cur_colormap;
-       guint        cur_sweep_tex;
+       GisViewer *viewer;
+       GisPrefs  *prefs;
+       GisHttp   *http;
+
+       /* Signals */
+       guint      time_changed_id;
+       guint      location_changed_id;
+
+       /* Tab area */
+       GtkWidget *config_body;
+       GtkWidget *progress_bar;
+       GtkWidget *progress_label;
+
+       /* Radar lists */
+       AWeatherColormap *colormap;
+       gpointer   radar;
+       gchar     *cur_site;
+       gchar     *cur_time;
 };
 
 struct _GisPluginRadarClass {