GNOME.org
 

r3873 - in branches/beast-mingw: . beast-gtk beast-gtk/gxk plugins/freeverb shell

Author: stw
Date: 2006-08-27 14:52:17 -0400 (Sun, 27 Aug 2006)
New Revision: 3873

Modified:
   branches/beast-mingw/ChangeLog.win32
   branches/beast-mingw/Makefile.am
   branches/beast-mingw/beast-gtk/bstdefs.h
   branches/beast-mingw/beast-gtk/bstmain.c
   branches/beast-mingw/beast-gtk/bstusermessage.c
   branches/beast-mingw/beast-gtk/gxk/gxktexttools.c
   branches/beast-mingw/beast-gtk/testgui.c
   branches/beast-mingw/plugins/freeverb/Makefile.am
   branches/beast-mingw/shell/bsescm.c
Log:
Sun Aug 27 20:41:36 2006  Stefan Westerfeld  <stefan space twc de>

	* shell/bsescm.c: Priority handling needs to be done differently under
	windows.

	* plugins/freeverb/Makefile.am: Add -no-undefined for dll building.

	* beast-gtk/bstusermessage.c:
	* beast-gtk/bstdefs.h: For defining _(...) [i18n], a helper macro
	_DOMAIN gets defined. However, the mingw headers already use _DOMAIN
	for some other purpose, so the macro needs renaming, to prevent a
	name clash (and the resulting program crashes). I don't know what
	would be a suitable name, so I've renamed it to BST_XXX_DOMAIN for
	now.

	* beast-gtk/testgui.c: Call bse_init_async with the correct type for
	the config structure, fixes segfaults on mingw.

	* beast-gtk/gxk/gxktexttools.c: Remove scandir/alphasort - we don't
	have these under mingw.

	* beast-gtk/bstmain.c: Priority handling needs to be done differently
	under windows. No srand48().

	* Makefile.am: Comment those directories out (remove them from
	SUBDIRS) for which currently no port is available: shell launchers
	doxer docs web.


Modified: branches/beast-mingw/ChangeLog.win32
===================================================================
--- branches/beast-mingw/ChangeLog.win32	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/ChangeLog.win32	2006-08-27 18:52:17 UTC (rev 3873)
@@ -1,3 +1,31 @@
+Sun Aug 27 20:41:36 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* shell/bsescm.c: Priority handling needs to be done differently under
+	windows.
+
+	* plugins/freeverb/Makefile.am: Add -no-undefined for dll building.
+
+	* beast-gtk/bstusermessage.c:
+	* beast-gtk/bstdefs.h: For defining _(...) [i18n], a helper macro
+	_DOMAIN gets defined. However, the mingw headers already use _DOMAIN
+	for some other purpose, so the macro needs renaming, to prevent a
+	name clash (and the resulting program crashes). I don't know what
+	would be a suitable name, so I've renamed it to BST_XXX_DOMAIN for
+	now.
+
+	* beast-gtk/testgui.c: Call bse_init_async with the correct type for
+	the config structure, fixes segfaults on mingw.
+
+	* beast-gtk/gxk/gxktexttools.c: Remove scandir/alphasort - we don't
+	have these under mingw.
+
+	* beast-gtk/bstmain.c: Priority handling needs to be done differently
+	under windows. No srand48().
+
+	* Makefile.am: Comment those directories out (remove them from
+	SUBDIRS) for which currently no port is available: shell launchers
+	doxer docs web.
+
 Sun Aug 27 20:38:09 2006  Stefan Westerfeld  <stefan space twc de>
 
 	* data/bse.pc.in: BSE does require not only gmodule-2.0, but also

Modified: branches/beast-mingw/Makefile.am
===================================================================
--- branches/beast-mingw/Makefile.am	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/Makefile.am	2006-08-27 18:52:17 UTC (rev 3873)
@@ -4,7 +4,11 @@
 ## GNU Lesser General Public License version 2 or any later version.
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = . data birnet sfi bse plugins shell beast-gtk launchers library tools po tests test slowtests doxer docs web
+# disabled in mingw port, because it requires...:
+# scheme: shell
+# priority stuff: launchers
+# python2.4: doxer docs web
+SUBDIRS = . data birnet sfi bse plugins beast-gtk library tools po tests test slowtests
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4 dist-bzip2 no-dist-gzip

Modified: branches/beast-mingw/beast-gtk/bstdefs.h
===================================================================
--- branches/beast-mingw/beast-gtk/bstdefs.h	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/beast-gtk/bstdefs.h	2006-08-27 18:52:17 UTC (rev 3873)
@@ -90,8 +90,11 @@
 
 
 /* --- i18n and gettext helpers --- */
-#define _DOMAIN (NULL)
-#define _(str)	dgettext (_DOMAIN, str)
+/* _DOMAIN is defined to 1 on mingw, by system headers
+ * so we need a new name (don't know what this could be)
+ */
+#define BST_XXX_DOMAIN (NULL)
+#define _(str)	dgettext (BST_XXX_DOMAIN, str)
 #define N_(str)	(str)
 
 

Modified: branches/beast-mingw/beast-gtk/bstmain.c
===================================================================
--- branches/beast-mingw/beast-gtk/bstmain.c	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/beast-gtk/bstmain.c	2006-08-27 18:52:17 UTC (rev 3873)
@@ -32,7 +32,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/time.h>
+#ifndef WIN32
 #include <sys/resource.h>
+#endif
 // #include "sfi/toyprof-mem.h"
 
 
@@ -100,7 +102,7 @@
   /* initialize random numbers */
   struct timeval tv;
   gettimeofday (&tv, NULL);
-  srand48 (tv.tv_usec + (tv.tv_sec << 16));
+  //srand48 (tv.tv_usec + (tv.tv_sec << 16));
   srand (tv.tv_usec + (tv.tv_sec << 16));
 
   /* initialize GLib guts */
@@ -178,7 +180,9 @@
   g_source_unref (source);
 
   /* now that the BSE thread runs, drop scheduling priorities if we have any */
+#if 0
   setpriority (PRIO_PROCESS, getpid(), 0);
+#endif
 
   /* watch registration notifications on server */
   bse_proxy_connect (BSE_SERVER,

Modified: branches/beast-mingw/beast-gtk/bstusermessage.c
===================================================================
--- branches/beast-mingw/beast-gtk/bstusermessage.c	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/beast-gtk/bstusermessage.c	2006-08-27 18:52:17 UTC (rev 3873)
@@ -351,7 +351,7 @@
   if (label)
     {
       gint count = g_object_get_int (dialog, "BEAST-user-message-count");
-      gchar *rstr = g_strdup_printf (dngettext (_DOMAIN, _("Message has been repeated %u time"), _("Message has been repeated %u times"), count), count);
+      gchar *rstr = g_strdup_printf (dngettext (BST_XXX_DOMAIN, _("Message has been repeated %u time"), _("Message has been repeated %u times"), count), count);
       g_object_set_int (dialog, "BEAST-user-message-count", count + 1);
       gtk_label_set_text (label, rstr);
       g_free (rstr);

Modified: branches/beast-mingw/beast-gtk/gxk/gxktexttools.c
===================================================================
--- branches/beast-mingw/beast-gtk/gxk/gxktexttools.c	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/beast-gtk/gxk/gxktexttools.c	2006-08-27 18:52:17 UTC (rev 3873)
@@ -1993,7 +1993,7 @@
           struct dirent **flist;
           gchar *tmp;
           gint n;
-          n = scandir (file, &flist, NULL, alphasort);
+          n = -1; // scandir (file, &flist, NULL, alphasort);
           if (n < 0)
             gxk_scroll_text_append_file (sctext, file); /* revert to "unknown file" */
           else

Modified: branches/beast-mingw/beast-gtk/testgui.c
===================================================================
--- branches/beast-mingw/beast-gtk/testgui.c	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/beast-gtk/testgui.c	2006-08-27 18:52:17 UTC (rev 3873)
@@ -125,9 +125,10 @@
   _bst_skin_config_init ();
 
   /* start BSE core and connect */
-  SfiRec *bseconfig = sfi_rec_new ();
-  bse_init_async (&argc, &argv, "TestGUI", bseconfig);
-  sfi_rec_unref (bseconfig);
+  BirnetInitValue config[] = {
+    { NULL },
+  };
+  bse_init_async (&argc, &argv, "TestGUI", config);
   sfi_glue_context_push (bse_init_glue_context ("TestGUI"));
   GSource *source = g_source_simple (G_PRIORITY_HIGH - 100,
                                      (GSourcePending) sfi_glue_context_pending,

Modified: branches/beast-mingw/plugins/freeverb/Makefile.am
===================================================================
--- branches/beast-mingw/plugins/freeverb/Makefile.am	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/plugins/freeverb/Makefile.am	2006-08-27 18:52:17 UTC (rev 3873)
@@ -11,7 +11,7 @@
 plugindir = $(bseplugindir)
 
 freeverb_la_SOURCES = allpass.cpp comb.cpp revmodel.cpp bsefreeverbcpp.cpp bsefreeverb.c
-freeverb_la_LDFLAGS = -module -avoid-version
+freeverb_la_LDFLAGS = -module -avoid-version -no-undefined
 freeverb_la_LIBADD  = $(top_builddir)/bse/libbse.la $(BSE_LIBS) -lm
 
 plugin_LTLIBRARIES = freeverb.la

Modified: branches/beast-mingw/shell/bsescm.c
===================================================================
--- branches/beast-mingw/shell/bsescm.c	2006-08-27 18:49:19 UTC (rev 3872)
+++ branches/beast-mingw/shell/bsescm.c	2006-08-27 18:52:17 UTC (rev 3873)
@@ -24,7 +24,9 @@
 #include <sfi/sfistore.h> /* no bin-compat */
 #include <sys/time.h>
 #include <libintl.h>
+#ifndef WIN32
 #include <sys/resource.h>
+#endif
 #include "bsescminterp.h"
 #include "topconfig.h"
 
@@ -99,8 +101,10 @@
       bse_scm_context = bse_init_glue_context (PRG_NAME);
     }
 
+#ifndef WIN32
   /* now that the BSE thread runs, drop scheduling priorities if we have any */
   setpriority (PRIO_PROCESS, getpid(), 0);
+#endif
 
   gh_enter (argc, argv, gh_main);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]