Changeset 3268 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_update.cc

Timestamp:

Dec 24, 2004, 4:25:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: deleted threading again. I have found a different Way
Now I am redrawing the GUI every time a ProgressBar is changed.

File:

• orxonox/branches/updater/src/gui/orxonox_gui_update.cc (modified) (3 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -158 +158 @@
   info->Bar = (ProgressBar*)bar;
   PRINTF(3)("Preparing to download file %s.\n", info->fileName);
-  //  downloadThread (info);
-
-  if (downloadThreadID == NULL)
-    {
-      if ( (downloadThreadID =g_thread_create(&downloadThread, info, TRUE, NULL)) == 0 )
-        PRINTF(1)("can't create the thread");
-    }
-  else 
-    PRINTF(1)("thread already in use\n");
-
+  download(info);
 }
 
@@ -198 +189 @@
 int OrxonoxGuiUpdate::curlProgressFunc (ProgressBar* Bar, double totalSize, double progress, double upTotal, double upProgress)
 {
-  gdk_threads_enter();
   Bar->setProgress(progress);
   Bar->setTotalSize(totalSize);
-  gdk_threads_leave();
   return 0;
-
-}
-
-GThread* OrxonoxGuiUpdate::downloadThreadID = NULL;
-
-void* OrxonoxGuiUpdate::downloadThread (void* fileInfo)
+}
+
+
+void* OrxonoxGuiUpdate::download (void* fileInfo)
 {
   
@@ -241 +228 @@
       curl_easy_cleanup(curl);
     }
-  downloadThreadID = NULL;
   return NULL;
 }
+
+#ifdef HAVE_GTK2
+gint OrxonoxGuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar)
+{
+}
+#endif /* HAVE_GTK2 */
 
 #endif /* HAVE_CURL */