gis-demo: avoid double-loading plugins

[grits] / src / gis-viewer.h

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 6b95e1a03f9b66ad5c02a76efa841116c8c49b34..02596f38468483d1fc64cf1be6496646f0ee5ae2 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 #include <glib-object.h>
 
+/* Rendering levels */
 #define GIS_LEVEL_BACKGROUND -100
 #define GIS_LEVEL_WORLD         0
 #define GIS_LEVEL_OVERLAY     100
@@ -41,6 +42,7 @@ typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 
 #include "gis-tile.h"
 #include "gis-plugin.h"
+#include "gis-prefs.h"
 #include "gis-object.h"
 
 struct _GisViewer {
@@ -48,8 +50,8 @@ struct _GisViewer {
 
        /* instance members */
        GisPlugins *plugins;
+       GisPrefs   *prefs;
        gchar      *time;
-       gchar      *site;
        gdouble     location[3];
        gdouble     rotation[3];
        gboolean    offline;
@@ -85,7 +87,7 @@ struct _GisViewerClass {
 GType gis_viewer_get_type(void);
 
 /* Methods */
-GisViewer *gis_viewer_new();
+void gis_viewer_setup(GisViewer *viewer, GisPlugins *plugins, GisPrefs *prefs);
 
 void gis_viewer_set_time(GisViewer *viewer, const gchar *time);
 gchar *gis_viewer_get_time(GisViewer *viewer);
@@ -99,10 +101,6 @@ void gis_viewer_set_rotation(GisViewer *viewer, gdouble  x, gdouble  y, gdouble
 void gis_viewer_get_rotation(GisViewer *viewer, gdouble *x, gdouble *y, gdouble *z);
 void gis_viewer_rotate      (GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
 
-/* To be deprecated, use {get,set}_location */
-void gis_viewer_set_site(GisViewer *viewer, const gchar *site);
-gchar *gis_viewer_get_site(GisViewer *viewer);
-
 void gis_viewer_refresh(GisViewer *viewer);
 
 void gis_viewer_set_offline(GisViewer *viewer, gboolean offline);