Win32 fixes and improvements

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 771b1d4ba449acc6d743cf7fe7b1271a3d56ee85..2ed86acb1568c9af3f4935c957364bafb000b8e5 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))
@@ -40,26 +34,24 @@ extern colormap_t colormaps[];
 typedef struct _GisPluginRadar        GisPluginRadar;
 typedef struct _GisPluginRadarClass   GisPluginRadarClass;
 
+typedef struct _RadarConus RadarConus;
+typedef struct _RadarSite  RadarSite;
+
 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 */
-       char        *cur_site;
-       char        *cur_time;
-       Radar       *cur_radar;
-       Sweep       *cur_sweep;
-       colormap_t  *cur_colormap;
-       guint        cur_sweep_tex;
+       GisViewer  *viewer;
+       GisPrefs   *prefs;
+       GtkWidget  *config;
+       AWeatherColormap *colormap;
+       gpointer    *hud_ref;
+
+       GHashTable *sites;
+       GisHttp    *sites_http;
+
+       RadarConus *conus;
+       GisHttp    *conus_http;
 };
 
 struct _GisPluginRadarClass {