Add support for GisMarker to Gis{Viewer,OpenGL}

[grits] / src / plugins / srtm.c

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index e4460fe9d2e2e3338f6dd8f4ca7386670ce6e430..d0e474041e5079ef4adb5c54176c087646ac9caf 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -162,7 +162,7 @@ static gboolean _load_tile_cb(gpointer _load)
        /* Do necessasairy processing */
        /* TODO: Lock this and move to thread, can remove self from _load then */
        if (LOAD_BIL)
-               gis_opengl_set_height_func(self->opengl, tile, _height_func, self, TRUE);
+               gis_viewer_set_height_func(self->viewer, tile, _height_func, self, TRUE);
 
        /* Cleanup unneeded things */
        if (!LOAD_BIL)
@@ -214,7 +214,7 @@ static gpointer _update_tiles(gpointer _self)
        GisPluginSrtm *self = _self;
        g_mutex_lock(self->mutex);
        gdouble lat, lon, elev;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
        gis_tile_update(self->tiles,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
                        lat, lon, elev,
@@ -228,8 +228,8 @@ static gpointer _update_tiles(gpointer _self)
 /*************
  * Callbacks *
  *************/
-static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdouble elev,
-               GisPluginSrtm *self)
+static void _on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev, GisPluginSrtm *self)
 {
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
@@ -237,19 +237,18 @@ static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdoubl
 /***********
  * Methods *
  ***********/
-GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginSrtm *gis_plugin_srtm_new(GisViewer *viewer)
 {
        g_debug("GisPluginSrtm: new");
        GisPluginSrtm *self = g_object_new(GIS_TYPE_PLUGIN_SRTM, NULL);
-       self->view   = view;
-       self->opengl = opengl;
+       self->viewer = viewer;
 
        /* Load initial tiles */
        _load_tile(self->tiles, self);
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
-       self->sigid = g_signal_connect(self->view, "location-changed",
+       self->sigid = g_signal_connect(self->viewer, "location-changed",
                        G_CALLBACK(_on_location_changed), self);
 
        return self;
@@ -261,7 +260,7 @@ static void gis_plugin_srtm_expose(GisPlugin *_self)
        g_debug("GisPluginSrtm: expose tiles=%p data=%p",
                self->tiles, self->tiles->data);
        if (LOAD_OPENGL)
-               gis_opengl_render_tiles(self->opengl, self->tiles);
+               gis_viewer_render_tiles(self->viewer, self->tiles);
 }
 
 
@@ -295,9 +294,9 @@ static void gis_plugin_srtm_dispose(GObject *gobject)
        g_debug("GisPluginSrtm: dispose");
        GisPluginSrtm *self = GIS_PLUGIN_SRTM(gobject);
        /* Drop references */
-       g_signal_handler_disconnect(self->view, self->sigid);
+       g_signal_handler_disconnect(self->viewer, self->sigid);
        if (LOAD_BIL)
-               gis_opengl_clear_height_func(self->opengl);
+               gis_viewer_clear_height_func(self->viewer);
        G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);
 }
 static void gis_plugin_srtm_finalize(GObject *gobject)