X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis_test.c;h=e41fec1d70d0bf09772e227a70562e3e8a28297f;hb=b088e18d9e838064bb264a145ff66e57886ee42a;hp=9d9fe9a304c031fad41c9dcc58cd5b4b0047efe6;hpb=7cde9672c505332bcca7b47d94acfdf28c7729fe;p=grits

diff --git a/src/gis_test.c b/src/gis_test.c
index 9d9fe9a..e41fec1 100644
--- a/src/gis_test.c
+++ b/src/gis_test.c
@@ -47,28 +47,28 @@ int main(int argc, char **argv)
 
 	GisPrefs   *prefs   = gis_prefs_new(NULL, NULL);
 	GisPlugins *plugins = gis_plugins_new(NULL);
-	GisWorld   *world   = gis_world_new();
-	GisView    *view    = gis_view_new();
-	GisOpenGL  *opengl  = gis_opengl_new(world, view, plugins);
-
-	//gis_plugins_load(plugins, "radar",   world, view, opengl, prefs);
-	//gis_plugins_load(plugins, "ridge",   world, view, opengl, prefs);
-	gis_plugins_load(plugins, "bmng", world, view, opengl, prefs);
-	gis_plugins_load(plugins, "srtm", world, view, opengl, prefs);
+	GisViewer  *viewer  = gis_opengl_new(plugins);
 
+	gdk_threads_enter();
 	GtkWidget  *window  = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_signal_connect(window,  "destroy",         G_CALLBACK(gtk_main_quit), NULL);
 	g_signal_connect(window,  "key-press-event", G_CALLBACK(on_key_press),  NULL);
-	gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(opengl));
+	gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(viewer));
 	gtk_widget_show_all(window);
+	gdk_threads_leave();
+
+	//gis_plugins_load(plugins, "bmng", viewer, prefs);
+	//gis_plugins_load(plugins, "srtm", viewer, prefs);
+	gis_plugins_load(plugins, "test", viewer, prefs);
+
+	gis_viewer_set_site(viewer, "KLSX");
 
-	gis_view_set_site(view, "KLSX");
+	gdk_threads_enter();
 	gtk_main();
 
 	g_object_unref(prefs);
-	g_object_unref(world);
-	g_object_unref(view);
-	g_object_unref(opengl);
+	g_object_unref(viewer);
 	gis_plugins_free(plugins);
+	gdk_threads_leave();
 	return 0;
 }