[SCM] gsequencer/upstream: refactored main.c
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:06:51 UTC 2015
The following commit has been merged in the upstream branch:
commit 63909c6b55e421303ae8dfe516455e1c315f52a8
Author: Joël Krähemann <weedlight at gmail.com>
Date: Sat Apr 4 19:55:12 2015 +0000
refactored main.c
diff --git a/Makefile b/Makefile
index 587a6b9..40a9788 100644
--- a/Makefile
+++ b/Makefile
@@ -820,17 +820,17 @@ TARGETS = gsequencer
noinst_LIBRARIES = libags.a libags_thread.a libags_audio.a libags_gui.a
# application
-libags_a_CFLAGS = -g -O2 -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_a_CFLAGS = -g -O2 -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_a_LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-libags_thread_a_CFLAGS = -g -O2 -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_thread_a_CFLAGS = -g -O2 -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_thread_a_LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_thread_a_LIBADD = libags.a
-libags_audio_a_CFLAGS = -g -O2 -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_audio_a_CFLAGS = -g -O2 -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_audio_a_LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_audio_a_LIBADD = libags_thread.a libags.a
-libags_gui_a_CFLAGS = -g -O2 -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_gui_a_CFLAGS = -g -O2 -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_gui_a_LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-gsequencer_CFLAGS = -g -O2 -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+gsequencer_CFLAGS = -g -O2 -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
gsequencer_LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
gsequencer_LDADD = libags_audio.a libags_gui.a libags_thread.a libags.a
ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.am b/Makefile.am
index 1ca2f72..690a1fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,21 +36,21 @@ noinst_LIBRARIES = libags.a libags_thread.a libags_audio.a libags_gui.a
bin_PROGRAMS = gsequencer
# application
-libags_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-libags_thread_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_thread_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_thread_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_thread_a_LIBADD = libags.a
-libags_audio_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_audio_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_audio_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_audio_a_LIBADD = libags_thread.a libags.a
-libags_gui_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_gui_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_gui_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-gsequencer_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+gsequencer_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
gsequencer_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
gsequencer_LDADD = libags_audio.a libags_gui.a libags_thread.a libags.a
diff --git a/Makefile.in b/Makefile.in
index 305f872..210cafb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -820,17 +820,17 @@ TARGETS = gsequencer
noinst_LIBRARIES = libags.a libags_thread.a libags_audio.a libags_gui.a
# application
-libags_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-libags_thread_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_thread_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_thread_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_thread_a_LIBADD = libags.a
-libags_audio_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_audio_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_audio_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
libags_audio_a_LIBADD = libags_thread.a libags.a
-libags_gui_a_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+libags_gui_a_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
libags_gui_a_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
-gsequencer_CFLAGS = @CFLAGS@ -g --pedantic -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+gsequencer_CFLAGS = @CFLAGS@ -g -Wall -O -I./src -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GDKPIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
gsequencer_LDFLAGS = @LDFLAGS@ -L/lib -L/usr/lib -L/usr/X11/lib -lm -pthread -lrt -lgmp $(UUID_LIBS) $(LIBAO_LIBS) $(LIBASOUND2_LIBS) $(LIBXML2_LIBS) $(SNDFILE_LIBS) $(LIBINSTPATCH_LIBS) $(GOBJECT_LIBS) $(GDKPIXBUF_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
gsequencer_LDADD = libags_audio.a libags_gui.a libags_thread.a libags.a
ACLOCAL_AMFLAGS = -I m4
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 1a9cb3c..6133580 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -43,196 +43,196 @@
'configure.ac'
],
{
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- '_LT_PROG_FC' => 1,
- 'AC_CHECK_LIBM' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- '_LT_AC_TAGVAR' => 1,
- '_LT_AC_SHELL_INIT' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
'AM_SILENT_RULES' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AM_PROG_LD' => 1,
- 'm4_pattern_allow' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ '_LT_PROG_FC' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'LT_AC_PROG_SED' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_AC_LOCK' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LTDL_INSTALLABLE' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'AC_PROG_LD' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_DLL_DEF_P' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AM_DEP_TRACK' => 1,
'AM_PROG_INSTALL_SH' => 1,
- 'LTOPTIONS_VERSION' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- 'include' => 1,
- '_LT_LIBOBJ' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
'_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- '_LT_LINKER_OPTION' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- '_LT_DLL_DEF_P' => 1,
- 'LT_PROG_RC' => 1,
+ 'AM_SANITY_CHECK' => 1,
'AC_DISABLE_SHARED' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'AC_PROG_LD_GNU' => 1,
- 'LT_PROG_GCJ' => 1,
- 'LT_PROG_GO' => 1,
- 'AC_LIB_LTDL' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- '_LT_CC_BASENAME' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
'_m4_warn' => 1,
- 'AM_DISABLE_STATIC' => 1,
- '_LT_AC_LANG_CXX' => 1,
+ 'LT_PATH_NM' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AC_LTDL_DLLIB' => 1,
'_LT_PROG_CXX' => 1,
- 'AM_DISABLE_SHARED' => 1,
- 'AC_LIBTOOL_F77' => 1,
- 'LT_FUNC_ARGZ' => 1,
- 'AC_PROG_NM' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LT_LANG' => 1,
- 'AM_MISSING_PROG' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'LT_INIT' => 1,
- 'AC_PATH_MAGIC' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
- 'fp_C_PROTOTYPES' => 1,
+ 'LT_PROG_GCJ' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'LT_OUTPUT' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'AC_LIBTOOL_FC' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'LT_INIT' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'AM_C_PROTOTYPES' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'LT_PATH_LD' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'AM_CONFIG_HEADER' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'LT_FUNC_ARGZ' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
'AM_CONDITIONAL' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'AM_PROG_NM' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_COMPILER_OPTION' => 1,
- 'AC_LTDL_SYSSEARCHPATH' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'AC_WITH_LTDL' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'LT_OUTPUT' => 1,
- 'AM_C_PROTOTYPES' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- 'LT_LIB_DLLOAD' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_ENABLE_SHARED' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ '_LT_PROG_F77' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AC_LTDL_PREOPEN' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'AM_SET_DEPDIR' => 1,
- '_AM_PROG_TAR' => 1,
- 'AM_ENABLE_SHARED' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ '_LT_CC_BASENAME' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AC_DEFUN' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ '_AM_DEPENDENCIES' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AM_PROG_NM' => 1,
- 'AU_DEFUN' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'LT_LIB_M' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'LT_AC_PROG_SED' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
- 'PKG_INSTALLDIR' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'AC_DISABLE_STATIC' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'include' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'LT_PROG_GO' => 1,
+ 'LTDL_INIT' => 1,
'LTVERSION_VERSION' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AM_PROG_CC_STDC' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'm4_include' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- '_LT_AC_LANG_F77' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'AC_LIBTOOL_PICMODE' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_LTDL_DLLIB' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
- 'AM_CONFIG_HEADER' => 1,
- '_LT_PROG_F77' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
- '_AM_DEPENDENCIES' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'AC_LIBTOOL_RC' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
+ 'LT_LANG' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'AM_PROG_LD' => 1,
+ '_LT_COMPILER_OPTION' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_PROG_LD' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'LTDL_INIT' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- 'LT_PATH_NM' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'AC_ENABLE_STATIC' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'LT_PATH_LD' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
- '_LTDL_SETUP' => 1,
- 'AM_DEP_TRACK' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- 'LTSUGAR_VERSION' => 1,
- 'AC_DEFUN' => 1,
- 'AC_PROG_EGREP' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_LTDL_SHLIBEXT' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- 'AC_ENABLE_SHARED' => 1,
+ 'LT_LIB_M' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'LT_PROG_RC' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
'AM_ENABLE_STATIC' => 1,
- 'LT_AC_PROG_EGREP' => 1,
+ 'AC_LIB_LTDL' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'LT_WITH_LTDL' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ '_LTDL_SETUP' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'm4_include' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'AM_PROG_CC_STDC' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ '_LT_AC_LOCK' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'fp_C_PROTOTYPES' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'm4_pattern_allow' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -247,65 +247,65 @@
'configure.ac'
],
{
- 'AC_FC_SRCEXT' => 1,
- '_AM_COND_IF' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_SILENT_RULES' => 1,
'sinclude' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_SUBST' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'AC_INIT' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- '_m4_warn' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AM_NLS' => 1,
- 'AM_PROG_F77_C_O' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'm4_sinclude' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AM_MAINTAINER_MODE' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AM_PATH_GUILE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AM_NLS' => 1,
'm4_pattern_allow' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- '_AM_COND_ELSE' => 1,
- 'AM_PROG_MOC' => 1,
- 'AM_POT_TOOLS' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
'AC_CANONICAL_SYSTEM' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'AM_PROG_AR' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_SUBST' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'include' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ 'AM_PROG_F77_C_O' => 1,
'm4_include' => 1,
- 'LT_INIT' => 1,
- 'AM_PROG_CXX_C_O' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AM_PROG_CC_C_O' => 1,
'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'LT_SUPPORTED_TAG' => 1,
'_AM_COND_ENDIF' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_SUBST_TRACE' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_CONDITIONAL' => 1,
- 'include' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_CONFIG_HEADERS' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ '_AM_COND_IF' => 1,
+ 'm4_sinclude' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+ 'AC_FC_FREEFORM' => 1,
+ 'm4_pattern_forbid' => 1,
'AM_ENABLE_MULTILIB' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AH_OUTPUT' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_PATH_GUILE' => 1,
'AC_FC_PP_DEFINE' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'LT_INIT' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AM_GNU_GETTEXT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AM_INIT_AUTOMAKE' => 1
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_INIT' => 1,
+ '_m4_warn' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AM_XGETTEXT_OPTION' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -348,196 +348,196 @@
'configure.ac'
],
{
- 'AM_AUX_DIR_EXPAND' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_WITH_LTDL' => 1,
+ '_LT_PROG_F77' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
'_AM_SET_OPTIONS' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_PROG_LD' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AM_SANITY_CHECK' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'AM_SILENT_RULES' => 1,
- 'LT_AC_PROG_GCJ' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- 'AC_CHECK_LIBM' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- '_LT_AC_TAGVAR' => 1,
- '_LT_PROG_FC' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- 'AC_DISABLE_SHARED' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'AC_ENABLE_SHARED' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_PROG_LIBTOOL' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'LT_PROG_RC' => 1,
- '_LT_DLL_DEF_P' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- '_LT_LINKER_OPTION' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
'include' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'LTOPTIONS_VERSION' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LTDL_INSTALLABLE' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_AC_LOCK' => 1,
- 'AM_DISABLE_SHARED' => 1,
- '_LT_PROG_CXX' => 1,
- 'LT_FUNC_ARGZ' => 1,
- 'AC_LIBTOOL_F77' => 1,
- '_LT_AC_LANG_CXX' => 1,
+ 'LTDL_INIT' => 1,
+ 'LT_PROG_GO' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'LTVERSION_VERSION' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AC_DEFUN' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
'LT_SYS_DLOPEN_SELF' => 1,
- 'AM_DISABLE_STATIC' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'LT_LANG' => 1,
+ '_AM_SET_OPTION' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1,
- '_m4_warn' => 1,
- '_LT_CC_BASENAME' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
'_AM_AUTOCONF_VERSION' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ 'AM_PROG_LD' => 1,
+ 'LT_LIB_M' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'LT_PROG_RC' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'LT_WITH_LTDL' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
'AM_RUN_LOG' => 1,
- 'AC_LIB_LTDL' => 1,
- 'LT_PROG_GO' => 1,
- 'LT_PROG_GCJ' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_PROG_LD_GNU' => 1,
- 'AM_C_PROTOTYPES' => 1,
- 'LT_LIB_DLLOAD' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- 'AC_WITH_LTDL' => 1,
- 'LT_OUTPUT' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'AC_LTDL_SYSSEARCHPATH' => 1,
- '_LT_COMPILER_OPTION' => 1,
+ 'AC_LIB_LTDL' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'm4_include' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ '_LTDL_SETUP' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
'fp_C_PROTOTYPES' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'AC_LIBTOOL_FC' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
- 'AC_PATH_MAGIC' => 1,
- 'AM_MISSING_PROG' => 1,
- 'LT_LANG' => 1,
- 'LT_INIT' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'm4_pattern_allow' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AM_PROG_CC_STDC' => 1,
'AC_LIBTOOL_SETUP' => 1,
- 'AC_PROG_NM' => 1,
+ '_LT_AC_LOCK' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'AC_DISABLE_STATIC' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'LTVERSION_VERSION' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
- '_AM_SET_OPTION' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'AC_LTDL_SYMBOL_USCORE' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- 'PKG_INSTALLDIR' => 1,
- 'AM_PROG_NM' => 1,
- 'LT_LIB_M' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ 'LTOPTIONS_VERSION' => 1,
'AU_DEFUN' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AM_ENABLE_SHARED' => 1,
- '_AM_PROG_TAR' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'AC_LTDL_PREOPEN' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- 'm4_pattern_forbid' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- 'AC_LIBTOOL_RC' => 1,
- '_LT_PROG_F77' => 1,
- 'AM_CONFIG_HEADER' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
+ 'AM_SILENT_RULES' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ '_LT_PROG_FC' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'_LT_PATH_TOOL_PREFIX' => 1,
- 'AC_LTDL_DLLIB' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ '_LT_DLL_DEF_P' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_PROG_NM' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AC_PROG_LD' => 1,
+ 'AC_LIBTOOL_F77' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- '_LT_AC_LANG_F77' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'LT_PROG_GCJ' => 1,
+ '_LT_PROG_CXX' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ 'LT_OUTPUT' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'LT_PATH_NM' => 1,
+ '_m4_warn' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ 'AM_C_PROTOTYPES' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'm4_include' => 1,
+ 'LT_INIT' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AM_PROG_CC_STDC' => 1,
+ 'LT_PATH_LD' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AM_CONFIG_HEADER' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
'AC_DEFUN_ONCE' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'AM_PROG_NM' => 1,
'AC_LIBTOOL_CXX' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'LTDL_INIT' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- 'LT_PATH_NM' => 1,
- 'AC_PROG_LD' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_ENABLE_SHARED' => 1,
- 'LT_WITH_LTDL' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_LTDL_SHLIBEXT' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_PROG_EGREP' => 1,
- 'LTSUGAR_VERSION' => 1,
- 'AC_DEFUN' => 1,
- '_LTDL_SETUP' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- 'AM_DEP_TRACK' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'LT_PATH_LD' => 1
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'LT_FUNC_ARGZ' => 1,
+ 'AM_CONDITIONAL' => 1
}
], 'Autom4te::Request' )
);
diff --git a/config.log b/config.log
index bfd09fa..bda52a5 100644
--- a/config.log
+++ b/config.log
@@ -1489,3 +1489,21 @@ on Device-03036C
config.status:1222: creating Makefile
config.status:1451: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by gsequencer config.status 0.4.3, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status Makefile depfiles
+
+on Device-03036C
+
+config.status:1222: creating Makefile
+config.status:1451: executing depfiles commands
diff --git a/src/ags/X/ags_xorg_application_context.c b/src/ags/X/ags_xorg_application_context.c
index c953113..62ae895 100644
--- a/src/ags/X/ags_xorg_application_context.c
+++ b/src/ags/X/ags_xorg_application_context.c
@@ -46,6 +46,8 @@ enum{
PROP_WINDOW,
};
+AgsXorgApplicationContext *ags_xorg_application_context = NULL;
+
GType
ags_xorg_application_context_get_type()
{
@@ -238,6 +240,35 @@ ags_xorg_application_context_finalize(GObject *gobject)
xorg_application_context = AGS_XORG_APPLICATION_CONTEXT(gobject);
}
+void
+ags_xorg_application_context_register_types(AgsApplicationContext *application_context)
+{
+ ags_gui_thread_get_type();
+
+ /* register machine */
+ ags_panel_get_type();
+ ags_panel_input_pad_get_type();
+ ags_panel_input_line_get_type();
+
+ ags_mixer_get_type();
+ ags_mixer_input_pad_get_type();
+ ags_mixer_input_line_get_type();
+
+ ags_drum_get_type();
+ ags_drum_output_pad_get_type();
+ ags_drum_output_line_get_type();
+ ags_drum_input_pad_get_type();
+ ags_drum_input_line_get_type();
+
+ ags_matrix_get_type();
+
+ ags_synth_get_type();
+ ags_synth_input_pad_get_type();
+ ags_synth_input_line_get_type();
+
+ ags_ffplayer_get_type();
+}
+
AgsXorgApplicationContext*
ags_xorg_application_context_new(AgsMainLoop *main_loop,
AgsConfig *config)
diff --git a/src/ags/main.c b/src/ags/X/ags_xorg_init.c
similarity index 52%
copy from src/ags/main.c
copy to src/ags/X/ags_xorg_init.c
index d3634d4..f2d90ad 100644
--- a/src/ags/main.c
+++ b/src/ags/X/ags_xorg_init.c
@@ -1,5 +1,5 @@
/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2005-2011 Joël Krähemann
+ * Copyright (C) 2015 Joël Krähemann
*
* 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
@@ -15,37 +15,19 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/main.h>
-#include <gtk/gtk.h>
-#include <libintl.h>
-#include <stdio.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/resource.h>
-#include <mcheck.h>
+#include <ags/X/ags_xorg_init.h>
-#include <X11/Xlib.h>
+#include <ags/object/ags_application_context.h>
-#include <gdk/gdk.h>
+#include <ags/audio/ags_audio_init.h>
-#include <sys/types.h>
-#include <pwd.h>
+#include <ags/X/ags_xorg_application_context.h>
-#include <sys/mman.h>
+void ags_xorg_colors_alloc();
-void ags_colors_alloc();
-
-static void ags_signal_cleanup();
-void ags_signal_handler(int signr);
-
-static sigset_t ags_wait_mask;
-
-static const gchar *ags_config_thread = AGS_CONFIG_THREAD;
-static const gchar *ags_config_devout = AGS_CONFIG_DEVOUT;
-
-extern void ags_thread_resume_handler(int sig);
-extern void ags_thread_suspend_handler(int sig);
+extern AgsApplicationContext *ags_application_context = NULL;
+extern AgsXorgApplicationContext *ags_xorg_application_context;
extern GtkStyle *matrix_style;
extern GtkStyle *ffplayer_style;
@@ -54,12 +36,8 @@ extern GtkStyle *notebook_style;
extern GtkStyle *meter_style;
extern GtkStyle *note_edit_style;
-extern AgsLadspaManager *ags_ladspa_manager;
-
-struct sigaction ags_sigact;
-
void
-ags_colors_alloc()
+ags_xorg_colors_alloc()
{
static gboolean allocated = FALSE;
@@ -284,374 +262,22 @@ ags_colors_alloc()
}
void
-ags_main_add_devout(AgsMain *ags_main,
- AgsDevout *devout)
-{
- if(ags_main == NULL ||
- devout == NULL){
- return;
- }
-
- g_object_ref(G_OBJECT(devout));
- ags_main->devout = g_list_prepend(ags_main->devout,
- devout);
-}
-
-void
-ags_main_register_widget_type()
-{
- ags_dial_get_type();
-}
-
-void
-ags_main_register_machine_type()
+ags_xorg_init_context(int *argc, gchar ***argv)
{
- ags_panel_get_type();
- ags_panel_input_pad_get_type();
- ags_panel_input_line_get_type();
-
- ags_mixer_get_type();
- ags_mixer_input_pad_get_type();
- ags_mixer_input_line_get_type();
-
- ags_drum_get_type();
- ags_drum_output_pad_get_type();
- ags_drum_output_line_get_type();
- ags_drum_input_pad_get_type();
- ags_drum_input_line_get_type();
-
- ags_matrix_get_type();
-
- ags_synth_get_type();
- ags_synth_input_pad_get_type();
- ags_synth_input_line_get_type();
-
- ags_ffplayer_get_type();
-}
-
-void
-ags_main_register_thread_type()
-{
- ags_thread_get_type();
-
- ags_audio_loop_get_type();
- ags_task_thread_get_type();
- ags_devout_thread_get_type();
- ags_iterator_thread_get_type();
- ags_recycling_thread_get_type();
- ags_timestamp_thread_get_type();
- ags_gui_thread_get_type();
-
- ags_thread_pool_get_type();
- ags_returnable_thread_get_type();
-}
-
-void
-ags_main_quit(AgsMain *ags_main)
-{
- ags_thread_stop(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread);
-}
-
-void
-ags_signal_handler(int signr)
-{
- if(signr == SIGINT){
- //TODO:JK: do backup
-
- exit(-1);
- }else{
- sigemptyset(&(ags_sigact.sa_mask));
-
- if(signr == AGS_ASYNC_QUEUE_SIGNAL_HIGH){
- // pthread_yield();
- }
- }
-}
-
-static void
-ags_signal_cleanup()
-{
- sigemptyset(&(ags_sigact.sa_mask));
-}
-
-int
-main(int argc, char **argv)
-{
- AgsApplicationContext *audio_application_context, *xorg_application_context;
- AgsGuiThread *gui_thread;
- GFile *autosave_file;
-
- gchar *filename, *autosave_filename;
-
- struct sched_param param;
- struct rlimit rl;
- struct sigaction sa;
-
- struct passwd *pw;
- uid_t uid;
- gchar *wdir, *config_file;
- int result;
-
- gboolean single_thread = FALSE;
- guint i;
-
- const char *error;
- const rlim_t kStackSize = 64L * 1024L * 1024L; // min stack size = 64 Mb
-
- // mtrace();
- atexit(ags_signal_cleanup);
-
- result = getrlimit(RLIMIT_STACK, &rl);
-
- /* set stack size 64M */
- if(result == 0){
- if(rl.rlim_cur < kStackSize){
- rl.rlim_cur = kStackSize;
- result = setrlimit(RLIMIT_STACK, &rl);
-
- if(result != 0){
- //TODO:JK
- }
- }
- }
-
- /* Ignore interactive and job-control signals. */
- signal(SIGINT, SIG_IGN);
- signal(SIGQUIT, SIG_IGN);
- signal(SIGTSTP, SIG_IGN);
- signal(SIGTTIN, SIG_IGN);
- signal(SIGTTOU, SIG_IGN);
- signal(SIGCHLD, SIG_IGN);
-
- ags_sigact.sa_handler = ags_signal_handler;
- sigemptyset(&ags_sigact.sa_mask);
- ags_sigact.sa_flags = 0;
- sigaction(SIGINT, &ags_sigact, (struct sigaction *) NULL);
- sigaction(SA_RESTART, &ags_sigact, (struct sigaction *) NULL);
-
- /* */
- sigfillset(&(ags_wait_mask));
- sigdelset(&(ags_wait_mask), AGS_THREAD_SUSPEND_SIG);
- sigdelset(&(ags_wait_mask), AGS_THREAD_RESUME_SIG);
-
- sigfillset(&(sa.sa_mask));
- sa.sa_flags = 0;
-
- sa.sa_handler = ags_thread_resume_handler;
- sigaction(AGS_THREAD_RESUME_SIG, &sa, NULL);
-
- sa.sa_handler = ags_thread_suspend_handler;
- sigaction(AGS_THREAD_SUSPEND_SIG, &sa, NULL);
-
- /**/
- LIBXML_TEST_VERSION;
+ ags_audio_init_context(argc, argv);
XInitThreads();
-
- g_thread_init(NULL);
gdk_threads_init();
- gtk_init(&argc, &argv);
- ipatch_init();
-
- ao_initialize();
-
- ags_colors_alloc();
-
- filename = NULL;
-
- for(i = 0; i < argc; i++){
- if(!strncmp(argv[i], "--single-thread\0", 16)){
- single_thread = TRUE;
- }else if(!strncmp(argv[i], "--filename\0", 11)){
- filename = argv[i + 1];
- i++;
- }
- }
-
- config = ags_config_new();
- uid = getuid();
- pw = getpwuid(uid);
-
- wdir = g_strdup_printf("%s/%s\0",
- pw->pw_dir,
- AGS_DEFAULT_DIRECTORY);
-
- config_file = g_strdup_printf("%s/%s\0",
- wdir,
- AGS_DEFAULT_CONFIG);
-
- ags_config_load_from_file(config,
- config_file);
-
- g_free(wdir);
- g_free(config_file);
-
- if(filename != NULL){
- AgsFile *file;
-
- file = g_object_new(AGS_TYPE_FILE,
- "filename\0", filename,
- NULL);
- ags_file_open(file);
- ags_file_read(file);
-
- ags_main = AGS_MAIN(file->ags_main);
- ags_file_close(file);
-
- ags_thread_start(ags_main->main_loop);
-
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
-
-#ifdef _USE_PTH
- pth_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#else
- pthread_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#endif
- }else{
- ags_main = ags_main_new();
-
- if(single_thread){
- ags_main->flags = AGS_MAIN_SINGLE_THREAD;
- }
-
- /* Declare ourself as a real time task */
- param.sched_priority = AGS_PRIORITY;
-
- if(sched_setscheduler(0, SCHED_FIFO, ¶m) == -1) {
- perror("sched_setscheduler failed\0");
- }
-
- mlockall(MCL_CURRENT | MCL_FUTURE);
-
- if((AGS_MAIN_SINGLE_THREAD & (ags_main->flags)) == 0){
- // GdkFrameClock *frame_clock;
-
-#ifdef AGS_WITH_XMLRPC_C
- AbyssInit(&error);
-
- xmlrpc_env_init(&(ags_main->env));
-#endif /* AGS_WITH_XMLRPC_C */
-
- /* AgsDevout */
- devout = ags_devout_new((GObject *) ags_main);
- ags_main_add_devout(ags_main,
- devout);
-
- /* */
- g_object_set(G_OBJECT(ags_main->autosave_thread),
- "devout\0", devout,
- NULL);
-
- /* AgsWindow */
- ags_main->window =
- window = ags_window_new((GObject *) ags_main);
- g_object_set(G_OBJECT(window),
- "devout\0", devout,
- NULL);
- g_object_ref(G_OBJECT(window));
-
- gtk_window_set_default_size((GtkWindow *) window, 500, 500);
- gtk_paned_set_position((GtkPaned *) window->paned, 300);
-
- ags_connectable_connect(window);
- gtk_widget_show_all((GtkWidget *) window);
-
- /* AgsServer */
- ags_main->server = ags_server_new((GObject *) ags_main);
-
- /* AgsMainLoop */
- ags_main->main_loop = AGS_MAIN_LOOP(ags_audio_loop_new((GObject *) devout, (GObject *) ags_main));
- g_object_ref(G_OBJECT(ags_main->main_loop));
- ags_connectable_connect(AGS_CONNECTABLE(ags_main->main_loop));
-
- /* start thread tree */
- ags_thread_start(ags_main->main_loop);
-
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
- }else{
- AgsSingleThread *single_thread;
-
- devout = ags_devout_new((GObject *) ags_main);
- ags_main_add_devout(ags_main,
- devout);
-
- g_object_set(G_OBJECT(ags_main->autosave_thread),
- "devout\0", devout,
- NULL);
-
- /* threads */
- single_thread = ags_single_thread_new((GObject *) devout);
-
- /* AgsWindow */
- ags_main->window =
- window = ags_window_new((GObject *) ags_main);
- g_object_set(G_OBJECT(window),
- "devout\0", devout,
- NULL);
- gtk_window_set_default_size((GtkWindow *) window, 500, 500);
- gtk_paned_set_position((GtkPaned *) window->paned, 300);
-
- ags_connectable_connect(window);
- gtk_widget_show_all((GtkWidget *) window);
-
- /* AgsMainLoop */
- ags_main->main_loop = AGS_MAIN_LOOP(ags_audio_loop_new((GObject *) devout, (GObject *) ags_main));
- g_object_ref(G_OBJECT(ags_main->main_loop));
-
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
-
- /* start thread tree */
- ags_thread_start((AgsThread *) single_thread);
- }
-
- if(!single_thread){
- /* join gui thread */
-#ifdef _USE_PTH
- pth_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#else
- pthread_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#endif
- }
- }
-
- /* free managers */
- if(ags_ladspa_manager != NULL){
- g_object_unref(ags_ladspa_manager_get_instance());
- }
-
- uid = getuid();
- pw = getpwuid(uid);
+ ags_gui_init(argc, &argv);
- autosave_filename = g_strdup_printf("%s/%s/%d-%s\0",
- pw->pw_dir,
- AGS_DEFAULT_DIRECTORY,
- getpid(),
- AGS_AUTOSAVE_THREAD_DEFAULT_FILENAME);
+ /* map x11 collors */
+ ags_colors_alloc();
- autosave_file = g_file_new_for_path(autosave_filename);
-
- if(g_file_query_exists(autosave_file,
- NULL)){
- g_file_delete(autosave_file,
- NULL,
- NULL);
- }
-
- g_free(autosave_filename);
- g_object_unref(autosave_file);
-
- // muntrace();
-
- return(0);
+ /* instantiate application context */
+ ags_xorg_application_context = ags_xorg_application_context_new(NULL,
+ NULL);
+ ags_application_context_add_sibling(ags_application_context,
+ ags_xorg_application_context);
}
+
diff --git a/src/ags/X/ags_effect_line_callbacks.c b/src/ags/X/ags_xorg_init.c~
similarity index 94%
copy from src/ags/X/ags_effect_line_callbacks.c
copy to src/ags/X/ags_xorg_init.c~
index 5b9890d..35d6401 100644
--- a/src/ags/X/ags_effect_line_callbacks.c
+++ b/src/ags/X/ags_xorg_init.c~
@@ -16,4 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/ags_effect_line_callbacks.h>
+void
+ags_xorg_init(int *argc, gchar ***argv)
+{
+}
+
diff --git a/src/ags/X/ags_effect_pad_callbacks.h b/src/ags/X/ags_xorg_init.h
similarity index 83%
copy from src/ags/X/ags_effect_pad_callbacks.h
copy to src/ags/X/ags_xorg_init.h
index af7c25f..b18d701 100644
--- a/src/ags/X/ags_effect_pad_callbacks.h
+++ b/src/ags/X/ags_xorg_init.h
@@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_EFFECT_PAD_CALLBACKS_H__
-#define __AGS_EFFECT_PAD_CALLBACKS_H__
+#ifndef __AGS_XORG_INIT_H__
+#define __AGS_XORG_INIT_H__
-#include <glib.h>
#include <glib-object.h>
+#include <glib-object.h>
+
#include <gtk/gtk.h>
-#include <ags/X/ags_effect_pad.h>
+void ags_xorg_init_context(int *argc, gchar ***argv);
-#endif /*__AGS_EFFECT_PAD_CALLBACKS_H__*/
+#endif /*__AGS_XORG_INIT_H__*/
diff --git a/src/ags/object/ags_init.h b/src/ags/X/ags_xorg_init.h~
similarity index 90%
copy from src/ags/object/ags_init.h
copy to src/ags/X/ags_xorg_init.h~
index 72e16b2..cbe87ab 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/X/ags_xorg_init.h~
@@ -16,9 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#ifndef __AGS_XORG_INIT_H__
+#define __AGS_XORG_INIT_H__
#include <glib-object.h>
-#endif /*__AGS_INIT_H__*/
+#endif /*__AGS_XORG_INIT_H__*/
diff --git a/src/ags/audio/#ags_libao.h# b/src/ags/audio/#ags_libao.h#
deleted file mode 100644
index 0752381..0000000
--- a/src/ags/audio/#ags_libao.h#
+++ /dev/null
@@ -1,213 +0,0 @@
-/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2014 Joël Krähemann
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __AGS_LIBAO_H__
-#define __AGS_LIBAO_H__
-
-#include <pthread.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <sys/types.h>
-
-#include <alsa/asoundlib.h>
-
-#include <ao/ao.h>
-
-#include <ags/thread/ags_audio_loop.h>
-#include <ags/thread/ags_task_thread.h>
-#include <ags/thread/ags_devout_thread.h>
-#include <ags/thread/ags_iterator_thread.h>
-
-#include <ags/audio/ags_recall_id.h>
-
-#define AGS_TYPE_LIBAO (ags_libao_get_type())
-#define AGS_LIBAO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AGS_TYPE_LIBAO, AgsLibao))
-#define AGS_LIBAO_CLASS(class) (G_TYPE_CHECK_CLASS_CAST(class, AGS_TYPE_LIBAO, AgsLibao))
-#define AGS_IS_LIBAO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AGS_TYPE_LIBAO))
-#define AGS_IS_LIBAO_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), AGS_TYPE_LIBAO))
-#define AGS_LIBAO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS(obj, AGS_TYPE_LIBAO, AgsLibaoClass))
-
-#define AGS_LIBAO_PLAY_DOMAIN(ptr) ((AgsLibaoPlayDomain *)(ptr))
-#define AGS_LIBAO_PLAY(ptr) ((AgsLibaoPlay *)(ptr))
-
-#define AGS_LIBAO_DEFAULT_SAMPLERATE (44100.0)
-#define AGS_LIBAO_DEFAULT_BUFFER_SIZE (940)
-#define AGS_LIBAO_DEFAULT_BPM (120.0)
-#define AGS_LIBAO_DEFAULT_JIFFIE ((double) AGS_LIBAO_DEFAULT_SAMPLERATE / (double) AGS_LIBAO_DEFAULT_BUFFER_SIZE)
-
-#define AGS_LIBAO_DEFAULT_TACT (1.0)
-#define AGS_LIBAO_DEFAULT_TACT_JIFFIE (60.0 / AGS_LIBAO_DEFAULT_BPM * AGS_LIBAO_DEFAULT_TACT)
-#define AGS_LIBAO_DEFAULT_TACTRATE (1.0 / AGS_LIBAO_DEFAULT_TACT_JIFFIE)
-
-#define AGS_LIBAO_DEFAULT_DELAY (AGS_LIBAO_DEFAULT_JIFFIE / AGS_LIBAO_DEFAULT_TACTRATE)
-
-typedef struct _AgsLibao AgsLibao;
-typedef struct _AgsLibaoClass AgsLibaoClass;
-typedef struct _AgsLibaoPlay AgsLibaoPlay;
-typedef struct _AgsLibaoPlayDomain AgsLibaoPlayDomain;
-
-typedef enum
- {
- AGS_LIBAO_BUFFER0 = 1,
- AGS_LIBAO_BUFFER1 = 1 << 1,
- AGS_LIBAO_BUFFER2 = 1 << 2,
- AGS_LIBAO_BUFFER3 = 1 << 3,
-
- AGS_LIBAO_ATTACK_FIRST = 1 << 4,
-
- AGS_LIBAO_PLAY = 1 << 5,
-
- AGS_LIBAO_LIBAO = 1 << 6,
- AGS_LIBAO_OSS = 1 << 7,
- AGS_LIBAO_ALSA = 1 << 8,
-
- AGS_LIBAO_SHUTDOWN = 1 << 9,
- AGS_LIBAO_START_PLAY = 1 << 10,
-
- AGS_LIBAO_NONBLOCKING = 1 << 11,
-
- AGS_LIBAO_TIMING_SET_0 = 1 << 12,
- AGS_LIBAO_TIMING_SET_1 = 1 << 13,
- }AgsLibaoFlags;
-
-typedef enum
- {
- AGS_LIBAO_PLAY_DONE = 1,
- AGS_LIBAO_PLAY_REMOVE = 1 << 1,
- AGS_LIBAO_PLAY_CHANNEL = 1 << 2,
- AGS_LIBAO_PLAY_PAD = 1 << 3,
- AGS_LIBAO_PLAY_AUDIO = 1 << 4,
- AGS_LIBAO_PLAY_PLAYBACK = 1 << 5,
- AGS_LIBAO_PLAY_SEQUENCER = 1 << 6,
- AGS_LIBAO_PLAY_NOTATION = 1 << 7,
- AGS_LIBAO_PLAY_SUPER_THREADED = 1 << 8,
- }AgsLibaoPlayFlags;
-
-typedef enum{
- AGS_LIBAO_RESOLUTION_8_BIT = 8,
- AGS_LIBAO_RESOLUTION_16_BIT = 16,
- AGS_LIBAO_RESOLUTION_24_BIT = 24,
- AGS_LIBAO_RESOLUTION_32_BIT = 32,
- AGS_LIBAO_RESOLUTION_64_BIT = 64,
-}AgsLibaoResolutionMode;
-
-#define AGS_LIBAO_ERROR (ags_libao_error_quark())
-
-typedef enum{
- AGS_LIBAO_ERROR_LOCKED_SOUNDCARD,
-}AgsLibaoError;
-
-struct _AgsLibao
-{
- GObject object;
-
- guint flags;
-
- guint dsp_channels;
- guint pcm_channels;
- guint bits;
- guint buffer_size;
- guint frequency; // sample_rate
-
- signed short** buffer;
-
- double bpm; // beats per minute
-
- gdouble *delay; // count of tics within buffer size
- guint *attack; // where currently tic resides in the stream's offset, measured in 1/64 of bpm
-
- gdouble delay_counter; // next time attack changeing when delay_counter == delay
- guint tic_counter;
-
- union{
- struct _AgsAO{
- ao_device *device;
- ao_sample_format *format;
- int driver_ao;
- }ao;
- }out;
-
- GObject *application_context;
-
- GList *audio;
-};
-
-struct _AgsLibaoClass
-{
- GObjectClass object;
-
- void (*play_init)(AgsLibao *libao,
- GError **error);
- void (*play)(AgsLibao *libao,
- GError **error);
- void (*stop)(AgsLibao *libao);
-
- void (*tic)(AgsLibao *libao);
-
- void (*note_offset_changed)(AgsLibao *libao, guint note_offset);
-};
-
-struct _AgsLibaoPlayDomain
-{
- GObject *domain;
-
- gboolean playback;
- gboolean sequencer;
- gboolean notation;
-
- GList *libao_play;
-};
-
-struct _AgsLibaoPlay
-{
- guint flags;
-
- AgsIteratorThread **iterator_thread;
-
- GObject *source;
- guint audio_channel;
-
- AgsRecallID *recall_id[3];
-};
-
-GType ags_libao_get_type();
-
-GQuark ags_libao_error_quark();
-
-AgsLibaoPlayDomain* ags_libao_play_domain_alloc();
-void ags_libao_play_domain_free(AgsLibaoPlayDomain *libao_play_domain);
-
-AgsLibaoPlay* ags_libao_play_alloc();
-void ags_libao_play_free(AgsLibaoPlay *libao_play);
-
-void ags_libao_list_cards(GList **card_id, GList **card_name);
-void ags_libao_pcm_info(char *card_id,
- guint *channels_min, guint *channels_max,
- guint *rate_min, guint *rate_max,
- guint *buffer_size_min, guint *buffer_size_max,
- GError **error);
-void ags_libao_tic(AgsLibao *libao);
-
-void ags_libao_note_offset_changed(AgsLibao *libao, guint note_offset);
-MAIN
-AgsLibao* ags_libao_new(GObject *application_context);
-
-#endif /*__AGS_LIBAO_H__*/
-
diff --git a/src/ags/audio/.#ags_libao.h b/src/ags/audio/.#ags_libao.h
deleted file mode 120000
index 3712ed7..0000000
--- a/src/ags/audio/.#ags_libao.h
+++ /dev/null
@@ -1 +0,0 @@
-minos at Device-03036C.11266:1428021034
\ No newline at end of file
diff --git a/src/ags/audio/ags_audio_application_context.c b/src/ags/audio/ags_audio_application_context.c
index ee8908a..0501616 100644
--- a/src/ags/audio/ags_audio_application_context.c
+++ b/src/ags/audio/ags_audio_application_context.c
@@ -53,6 +53,7 @@ enum{
PROP_SOUNDCARD,
};
+AgsAudioApplicationContext *ags_audio_application_context = NULL;
extern AgsConfig *ags_config;
GType
@@ -393,6 +394,7 @@ ags_audio_application_context_set_value_callback(AgsConfig *config, gchar *group
void
ags_audio_application_context_register_types(AgsApplicationContext *application_context)
{
+ /* register recalls */
ags_play_audio_get_type();
ags_play_channel_get_type();
ags_play_channel_run_get_type();
diff --git a/src/ags/X/ags_effect_bridge_callbacks.c b/src/ags/audio/ags_audio_init.c
similarity index 51%
copy from src/ags/X/ags_effect_bridge_callbacks.c
copy to src/ags/audio/ags_audio_init.c
index 1186a7e..0a60821 100644
--- a/src/ags/X/ags_effect_bridge_callbacks.c
+++ b/src/ags/audio/ags_audio_init.c
@@ -16,25 +16,31 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/ags_effect_bridge_callbacks.h>
+#include <ags/audio/ags_audio_init.h>
+
+#include <ags/object/ags_application_context.h>
+
+#include <ags/thread/ags_thread_init.h>
+
+extern AgsApplicationContext *ags_application_context = NULL;
+extern AgsAudioApplicationContext *ags_audio_application_context;
void
-ags_effect_bridge_set_audio_channels_callback(AgsAudio *audio,
- guint audio_channels, guint audio_channels_old,
- AgsEffectBridge *effect_bridge)
+ags_audio_init_context(int *argc, gchar ***argv)
{
- ags_effect_bridge_resize_audio_channels(effect_bridge,
- audio_channels, audio_channels_old);
-}
+ ags_thread_init(argc, argv);
+
+ ao_initialize();
-void
-ags_effect_bridge_set_pads_callback(AgsAudio *audio,
- GType channel_type,
- guint pads, guint pads_old,
- AgsEffectBridge *effect_bridge)
-{
- ags_effect_bridge_resize_pads(effect_bridge,
- channel_type,
- pads, pads_old);
-}
+ ipatch_init();
+ /* complete thread pool */
+ ags_thread_application_context->thread_pool->parent = AGS_THREAD(audio_loop);
+ ags_thread_pool_start(ags_main->thread_pool);
+
+ /* instantiate application context */
+ ags_audio_application_context = ags_audio_application_context_new(NULL,
+ NULL);
+ ags_application_context_add_sibling(ags_application_context,
+ ags_audio_application_context);
+}
diff --git a/src/ags/X/machine/ags_ladspa_bridge_callbacks.c b/src/ags/audio/ags_audio_init.c~
similarity index 88%
copy from src/ags/X/machine/ags_ladspa_bridge_callbacks.c
copy to src/ags/audio/ags_audio_init.c~
index cf09835..8a55670 100644
--- a/src/ags/X/machine/ags_ladspa_bridge_callbacks.c
+++ b/src/ags/audio/ags_audio_init.c~
@@ -16,5 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/machine/ags_ladspa_bridge_callbacks.h>
+#include <ags/audio/ags_audio_init.h>
+void
+ags_audio_init(int *argc, gchar ***argv)
+{
+ ao_initialize();
+}
diff --git a/src/ags/object/ags_init.h b/src/ags/audio/ags_audio_init.h
similarity index 83%
copy from src/ags/object/ags_init.h
copy to src/ags/audio/ags_audio_init.h
index 72e16b2..934ef94 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/audio/ags_audio_init.h
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#ifndef __AGS_AUDIO_INIT_H__
+#define __AGS_AUDIO_INIT_H__
+#include <glib.h>
#include <glib-object.h>
-#endif /*__AGS_INIT_H__*/
+void ags_audio_init_context(int *argc, gchar ***argv);
+
+#endif /*__AGS_AUDIO_INIT_H__*/
diff --git a/src/ags/audio/ags_audio_init.h~ b/src/ags/audio/ags_audio_init.h~
new file mode 100644
index 0000000..587423b
--- /dev/null
+++ b/src/ags/audio/ags_audio_init.h~
@@ -0,0 +1 @@
+void ags_audio_init(int *argc, gchar ***argv);
diff --git a/src/ags/audio/ags_init.c~ b/src/ags/audio/ags_init.c~
new file mode 100644
index 0000000..de1ba31
--- /dev/null
+++ b/src/ags/audio/ags_init.c~
@@ -0,0 +1 @@
+ ao_initialize();
diff --git a/src/ags/main.c b/src/ags/main.c
index d3634d4..cf8aadd 100644
--- a/src/ags/main.c
+++ b/src/ags/main.c
@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <ags/main.h>
#include <gtk/gtk.h>
@@ -34,302 +35,25 @@
#include <sys/mman.h>
-void ags_colors_alloc();
-
static void ags_signal_cleanup();
void ags_signal_handler(int signr);
-static sigset_t ags_wait_mask;
-
-static const gchar *ags_config_thread = AGS_CONFIG_THREAD;
-static const gchar *ags_config_devout = AGS_CONFIG_DEVOUT;
-
extern void ags_thread_resume_handler(int sig);
extern void ags_thread_suspend_handler(int sig);
-extern GtkStyle *matrix_style;
-extern GtkStyle *ffplayer_style;
-extern GtkStyle *editor_style;
-extern GtkStyle *notebook_style;
-extern GtkStyle *meter_style;
-extern GtkStyle *note_edit_style;
+static sigset_t ags_wait_mask;
extern AgsLadspaManager *ags_ladspa_manager;
struct sigaction ags_sigact;
void
-ags_colors_alloc()
-{
- static gboolean allocated = FALSE;
-
- if(!allocated){
- allocated = TRUE;
-
- matrix_style = gtk_style_new();
- matrix_style->fg[0].red = 120 * (65535/255);
- matrix_style->fg[0].green = 220 * (65535/255);
- matrix_style->fg[0].blue = 120 * (65535/255);
- matrix_style->fg[0].pixel = (gulong)(120*65536 + 220*256 + 120);
-
- matrix_style->light[0].red = 100 * (65535/255);
- matrix_style->light[0].green = 200 * (65535/255);
- matrix_style->light[0].blue = 100 * (65535/255);
- matrix_style->light[0].pixel = (gulong)(100*65536 + 200*256 + 100);
-
- matrix_style->bg[0].red = 0 * (65535/255);
- matrix_style->bg[0].green = 80 * (65535/255);
- matrix_style->bg[0].blue = 0 * (65535/255);
- matrix_style->bg[0].pixel = (gulong)(0*65536 + 80*256 + 0);
-
- matrix_style->bg[1].red = 120 * (65535/255);
- matrix_style->bg[1].green = 220 * (65535/255);
- matrix_style->bg[1].blue = 120 * (65535/255);
- matrix_style->bg[1].pixel = (gulong)(120*65536 + 220*256 + 120);
-
- matrix_style->bg[2].red = 120 * (65535/255);
- matrix_style->bg[2].green = 220 * (65535/255);
- matrix_style->bg[2].blue = 120 * (65535/255);
- matrix_style->bg[2].pixel = (gulong)(120*65536 + 220*256 + 120);
-
- matrix_style->base[0].red = 120 * (65535/255);
- matrix_style->base[0].green = 220 * (65535/255);
- matrix_style->base[0].blue = 120 * (65535/255);
- matrix_style->base[0].pixel = (gulong)(120*65536 + 220*256 + 120);
-
-
- /* matrix_style->fg[1] = matrix_green;
- matrix_style->fg[2] = matrix_green;
- matrix_style->fg[3] = matrix_green;
- matrix_style->fg[4] = matrix_green;
-
- matrix_style->bg[0] = matrix_led_bg;
- matrix_style->bg[1] = matrix_led_bg;
- matrix_style->bg[2] = matrix_led_bg;
- matrix_style->bg[2] = matrix_led_bg;
- matrix_style->bg[3] = matrix_led_bg;
- matrix_style->bg[4] = matrix_led_bg;
- */
-
- /* ffplayer style */
- ffplayer_style = gtk_style_new();
- ffplayer_style->fg[0].red = 180 * (65535/255);
- ffplayer_style->fg[0].green = 180 * (65535/255);
- ffplayer_style->fg[0].blue = 250 * (65535/255);
- ffplayer_style->fg[0].pixel = (gulong)(120*65536 + 120*256 + 220);
-
- ffplayer_style->bg[0].red = 4 * (65535/255);
- ffplayer_style->bg[0].green = 8 * (65535/255);
- ffplayer_style->bg[0].blue = 56 * (65535/255);
- ffplayer_style->bg[0].pixel = (gulong)(4*65536 + 8*256 + 56);
-
- ffplayer_style->bg[1].red = 120 * (65535/255);
- ffplayer_style->bg[1].green = 120 *(65535/255);
- ffplayer_style->bg[1].blue = 120 * (65535/255);
- ffplayer_style->bg[1].pixel = (gulong)(120*65536 + 120*256 + 120);
-
- ffplayer_style->bg[2].red = 120 * (65535/255);
- ffplayer_style->bg[2].green = 120 *(65535/255);
- ffplayer_style->bg[2].blue = 120 * (65535/255);
- ffplayer_style->bg[2].pixel = (gulong)(255*65536 + 255*256 + 255);
-
- ffplayer_style->mid[0].red = 4 * (65535/255);
- ffplayer_style->mid[0].green = 8 * (65535/255);
- ffplayer_style->mid[0].blue = 56 * (65535/255);
- ffplayer_style->mid[0].pixel = (gulong)(4*65536 + 8*256 + 56);
-
- ffplayer_style->light[0].red = 120 * (65535/255);
- ffplayer_style->light[0].green = 120 * (65535/255);
- ffplayer_style->light[0].blue = 220 * (65535/255);
- ffplayer_style->light[0].pixel = (gulong)(120*65536 + 120*256 + 220);
-
- ffplayer_style->base[0].red = 120 * (65535/255);
- ffplayer_style->base[0].green = 120 * (65535/255);
- ffplayer_style->base[0].blue = 220 * (65535/255);
- ffplayer_style->base[0].pixel = (gulong)(120*65536 + 120*256 + 220);
-
-
- /* editor style */
- editor_style = gtk_style_new();
- editor_style->fg[0].red = 255 * (65535/255);
- editor_style->fg[0].green = 240 *(65535/255);
- editor_style->fg[0].blue = 200 * (65535/255);
- editor_style->fg[0].pixel = (gulong)(255*65536 + 240*256 + 200);
-
- editor_style->bg[0].red = 255 * (65535/255);
- editor_style->bg[0].green = 255 *(65535/255);
- editor_style->bg[0].blue = 100 * (65535/255);
- editor_style->bg[0].pixel = (gulong)(255*65536 + 255*256 + 255);
-
- editor_style->mid[0].red = 250 * (65535/255);
- editor_style->mid[0].green = 0 *(65535/255);
- editor_style->mid[0].blue = 250 * (65535/255);
- editor_style->mid[0].pixel = (gulong)(150*65536 + 150*256 + 250);
-
-
- editor_style->base[0].red = 250 * (65535/255);
- editor_style->base[0].green = 250 *(65535/255);
- editor_style->base[0].blue = 250 * (65535/255);
- editor_style->base[0].pixel = (gulong)(250*65536 + 250*256 + 250);
-
-
- /* notebook style */
- notebook_style = gtk_style_new();
- notebook_style->fg[0].red = 255 * (65535/255);
- notebook_style->fg[0].green = 255 *(65535/255);
- notebook_style->fg[0].blue = 0 * (65535/255);
- notebook_style->fg[0].pixel = (gulong)(255*65536 + 255*256 + 0);
-
- notebook_style->bg[0].red = 40 * (65535/255);
- notebook_style->bg[0].green = 40 *(65535/255);
- notebook_style->bg[0].blue = 40 * (65535/255);
- notebook_style->bg[0].pixel = (gulong)(40*65536 + 40*256 + 40);
-
- notebook_style->mid[0].red = 10 * (65535/255);
- notebook_style->mid[0].green = 20 *(65535/255);
- notebook_style->mid[0].blue = 230 * (65535/255);
- notebook_style->mid[0].pixel = (gulong)(10*65536 + 20*256 + 230);
-
- notebook_style->dark[0].red = 192 * (65535/255);
- notebook_style->dark[0].green = 192 *(65535/255);
- notebook_style->dark[0].blue = 0 * (65535/255);
- notebook_style->dark[0].pixel = (gulong)(150*65536 + 150*256 + 250);
-
- notebook_style->light[0].red = 255 * (65535/255);
- notebook_style->light[0].green = 255 *(65535/255);
- notebook_style->light[0].blue = 63 * (65535/255);
- notebook_style->light[0].pixel = (gulong)(255*65536 + 255*256 + 63);
-
- notebook_style->base[0].red = 0 * (65535/255);
- notebook_style->base[0].green = 0 *(65535/255);
- notebook_style->base[0].blue = 0 * (65535/255);
- notebook_style->base[0].pixel = (gulong)(0*65536 + 0*256 + 0);
-
-
- /* ruler style */
- //TODO:JK: deprecated
- // ruler_style = gtk_style_new();
- // ruler_style->fg[0].red = 255 * (65535/255);
- // ruler_style->fg[0].green = 240 *(65535/255);
- // ruler_style->fg[0].blue = 200 * (65535/255);
- // ruler_style->fg[0].pixel = (gulong)(255*65536 + 240*256 + 200);
-
- // ruler_style->bg[0].red = 40 * (65535/255);
- // ruler_style->bg[0].green = 40 *(65535/255);
- // ruler_style->bg[0].blue = 40 * (65535/255);
- // ruler_style->bg[0].pixel = (gulong)(40*65536 + 40*256 + 40);
-
- // ruler_style->mid[0].red = 250 * (65535/255);
- // ruler_style->mid[0].green = 0 *(65535/255);
- // ruler_style->mid[0].blue = 250 * (65535/255);
- // ruler_style->mid[0].pixel = (gulong)(150*65536 + 150*256 + 250);
-
- // ruler_style->base[0].red = 250 * (65535/255);
- // ruler_style->base[0].green = 250 *(65535/255);
- // ruler_style->base[0].blue = 250 * (65535/255);
- // ruler_style->base[0].pixel = (gulong)(250*65536 + 250*256 + 250);
-
-
- /* meter style */
- meter_style = gtk_style_new();
- meter_style->fg[0].red = 100 * (65535/255);
- meter_style->fg[0].green = 200 *(65535/255);
- meter_style->fg[0].blue = 255 * (65535/255);
- meter_style->fg[0].pixel = (gulong)(100*65536 + 200*256 + 255);
-
- meter_style->bg[0].red = 40 * (65535/255);
- meter_style->bg[0].green = 40 *(65535/255);
- meter_style->bg[0].blue = 40 * (65535/255);
- meter_style->bg[0].pixel = (gulong)(40*65536 + 40*256 + 40);
-
- meter_style->mid[0].red = 10 * (65535/255);
- meter_style->mid[0].green = 20 *(65535/255);
- meter_style->mid[0].blue = 230 * (65535/255);
- meter_style->mid[0].pixel = (gulong)(10*65536 + 20*256 + 230);
-
- meter_style->light[0].red = 0 * (65535/255);
- meter_style->light[0].green = 150 *(65535/255);
- meter_style->light[0].blue = 255 * (65535/255);
- meter_style->light[0].pixel = (gulong)(150*65536 + 150*256 + 250);
-
- meter_style->base[0].red = 0 * (65535/255);
- meter_style->base[0].green = 0 *(65535/255);
- meter_style->base[0].blue = 0 * (65535/255);
- meter_style->base[0].pixel = (gulong)(0*65536 + 0*256 + 0);
-
-
- /* note_edit style */
- note_edit_style = gtk_style_new();
- note_edit_style->fg[0].red = 255 * (65535/255);
- note_edit_style->fg[0].green = 240 *(65535/255);
- note_edit_style->fg[0].blue = 200 * (65535/255);
- note_edit_style->fg[0].pixel = (gulong)(255*65536 + 240*256 + 200);
-
- note_edit_style->bg[0].red = 255 * (65535/255);
- note_edit_style->bg[0].green = 255 *(65535/255);
- note_edit_style->bg[0].blue = 100 * (65535/255);
- note_edit_style->bg[0].pixel = (gulong)(255*65536 + 255*256 + 255);
-
- note_edit_style->mid[0].red = 250 * (65535/255);
- note_edit_style->mid[0].green = 0 *(65535/255);
- note_edit_style->mid[0].blue = 250 * (65535/255);
- note_edit_style->mid[0].pixel = (gulong)(150*65536 + 150*256 + 250);
-
-
- note_edit_style->base[0].red = 250 * (65535/255);
- note_edit_style->base[0].green = 250 *(65535/255);
- note_edit_style->base[0].blue = 250 * (65535/255);
- note_edit_style->base[0].pixel = (gulong)(250*65536 + 250*256 + 250);
- }
-}
-
-void
-ags_main_add_devout(AgsMain *ags_main,
- AgsDevout *devout)
-{
- if(ags_main == NULL ||
- devout == NULL){
- return;
- }
-
- g_object_ref(G_OBJECT(devout));
- ags_main->devout = g_list_prepend(ags_main->devout,
- devout);
-}
-
-void
ags_main_register_widget_type()
{
ags_dial_get_type();
}
void
-ags_main_register_machine_type()
-{
- ags_panel_get_type();
- ags_panel_input_pad_get_type();
- ags_panel_input_line_get_type();
-
- ags_mixer_get_type();
- ags_mixer_input_pad_get_type();
- ags_mixer_input_line_get_type();
-
- ags_drum_get_type();
- ags_drum_output_pad_get_type();
- ags_drum_output_line_get_type();
- ags_drum_input_pad_get_type();
- ags_drum_input_line_get_type();
-
- ags_matrix_get_type();
-
- ags_synth_get_type();
- ags_synth_input_pad_get_type();
- ags_synth_input_line_get_type();
-
- ags_ffplayer_get_type();
-}
-
-void
ags_main_register_thread_type()
{
ags_thread_get_type();
@@ -340,7 +64,6 @@ ags_main_register_thread_type()
ags_iterator_thread_get_type();
ags_recycling_thread_get_type();
ags_timestamp_thread_get_type();
- ags_gui_thread_get_type();
ags_thread_pool_get_type();
ags_returnable_thread_get_type();
@@ -377,25 +100,19 @@ ags_signal_cleanup()
int
main(int argc, char **argv)
{
- AgsApplicationContext *audio_application_context, *xorg_application_context;
AgsGuiThread *gui_thread;
GFile *autosave_file;
-
+
gchar *filename, *autosave_filename;
+ gboolean single_thread = FALSE;
+ guint i;
struct sched_param param;
struct rlimit rl;
struct sigaction sa;
-
- struct passwd *pw;
- uid_t uid;
- gchar *wdir, *config_file;
+
int result;
-
- gboolean single_thread = FALSE;
- guint i;
- const char *error;
const rlim_t kStackSize = 64L * 1024L * 1024L; // min stack size = 64 Mb
// mtrace();
@@ -443,21 +160,19 @@ main(int argc, char **argv)
sa.sa_handler = ags_thread_suspend_handler;
sigaction(AGS_THREAD_SUSPEND_SIG, &sa, NULL);
- /**/
- LIBXML_TEST_VERSION;
+ /* init gsequencer */
+ ags_xorg_init_context(&argc, &argv);
- XInitThreads();
+ /* Declare ourself as a real time task */
+ param.sched_priority = AGS_PRIORITY;
- g_thread_init(NULL);
- gdk_threads_init();
-
- gtk_init(&argc, &argv);
- ipatch_init();
-
- ao_initialize();
+ if(sched_setscheduler(0, SCHED_FIFO, ¶m) == -1) {
+ perror("sched_setscheduler failed\0");
+ }
- ags_colors_alloc();
+ mlockall(MCL_CURRENT | MCL_FUTURE);
+ /* parse command line parameter */
filename = NULL;
for(i = 0; i < argc; i++){
@@ -469,24 +184,6 @@ main(int argc, char **argv)
}
}
- config = ags_config_new();
- uid = getuid();
- pw = getpwuid(uid);
-
- wdir = g_strdup_printf("%s/%s\0",
- pw->pw_dir,
- AGS_DEFAULT_DIRECTORY);
-
- config_file = g_strdup_printf("%s/%s\0",
- wdir,
- AGS_DEFAULT_CONFIG);
-
- ags_config_load_from_file(config,
- config_file);
-
- g_free(wdir);
- g_free(config_file);
-
if(filename != NULL){
AgsFile *file;
@@ -496,143 +193,121 @@ main(int argc, char **argv)
ags_file_open(file);
ags_file_read(file);
- ags_main = AGS_MAIN(file->ags_main);
+ application_context = AGS_MAIN(file->application_context);
ags_file_close(file);
-
- ags_thread_start(ags_main->main_loop);
-
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
-
-#ifdef _USE_PTH
- pth_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#else
- pthread_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
-#endif
}else{
- ags_main = ags_main_new();
-
- if(single_thread){
- ags_main->flags = AGS_MAIN_SINGLE_THREAD;
- }
-
- /* Declare ourself as a real time task */
- param.sched_priority = AGS_PRIORITY;
-
- if(sched_setscheduler(0, SCHED_FIFO, ¶m) == -1) {
- perror("sched_setscheduler failed\0");
- }
+ AgsThread *audio_loop;
+ AgsDevout *devout;
+ AgsWindow *window;
+ AgsServer *server;
+
+ struct passwd *pw;
+ uid_t uid;
+ gchar *wdir, *config_file;
+
+ ags_config_load_from_file(ags_config,
+ config_file);
- mlockall(MCL_CURRENT | MCL_FUTURE);
+ uid = getuid();
+ pw = getpwuid(uid);
- if((AGS_MAIN_SINGLE_THREAD & (ags_main->flags)) == 0){
- // GdkFrameClock *frame_clock;
+ wdir = g_strdup_printf("%s/%s\0",
+ pw->pw_dir,
+ AGS_DEFAULT_DIRECTORY);
-#ifdef AGS_WITH_XMLRPC_C
- AbyssInit(&error);
+ config_file = g_strdup_printf("%s/%s\0",
+ wdir,
+ AGS_DEFAULT_CONFIG);
- xmlrpc_env_init(&(ags_main->env));
-#endif /* AGS_WITH_XMLRPC_C */
+ g_free(wdir);
+ g_free(config_file);
- /* AgsDevout */
- devout = ags_devout_new((GObject *) ags_main);
- ags_main_add_devout(ags_main,
- devout);
+ /* AgsDevout */
+ devout = ags_devout_new();
+ g_object_set(ags_audio_application_context,
+ "soundcard\0", devout,
+ NULL);
+
+ /* AgsWindow */
+ window = ags_window_new();
+ g_object_set(ags_xorg_application_context,
+ "window\0", window,
+ "soundcard\0", devout,
+ NULL);
+ g_object_ref(G_OBJECT(window));
- /* */
- g_object_set(G_OBJECT(ags_main->autosave_thread),
- "devout\0", devout,
- NULL);
+ gtk_window_set_default_size((GtkWindow *) window, 500, 500);
+ gtk_paned_set_position((GtkPaned *) window->paned, 300);
- /* AgsWindow */
- ags_main->window =
- window = ags_window_new((GObject *) ags_main);
- g_object_set(G_OBJECT(window),
- "devout\0", devout,
- NULL);
- g_object_ref(G_OBJECT(window));
+ ags_connectable_connect(AGS_CONNECTABLE(window));
+ gtk_widget_show_all((GtkWidget *) window);
- gtk_window_set_default_size((GtkWindow *) window, 500, 500);
- gtk_paned_set_position((GtkPaned *) window->paned, 300);
+ /* AgsServer */
+ server = ags_server_new();
+ g_object_set(ags_server_application_context,
+ "server\0", server,
+ NULL);
- ags_connectable_connect(window);
- gtk_widget_show_all((GtkWidget *) window);
+ /* AgsMainLoop */
+ audio_loop = (AgsThread *) ags_audio_loop_new((GObject *) devout);
+ g_object_set(ags_application_context,
+ "main-loop\0", audio_loop,
+ NULL);
- /* AgsServer */
- ags_main->server = ags_server_new((GObject *) ags_main);
+ g_object_ref(audio_loop);
+ ags_connectable_connect(AGS_CONNECTABLE(audio_loop));
- /* AgsMainLoop */
- ags_main->main_loop = AGS_MAIN_LOOP(ags_audio_loop_new((GObject *) devout, (GObject *) ags_main));
- g_object_ref(G_OBJECT(ags_main->main_loop));
- ags_connectable_connect(AGS_CONNECTABLE(ags_main->main_loop));
+ /* start thread tree */
+ ags_thread_start(audio_loop);
- /* start thread tree */
- ags_thread_start(ags_main->main_loop);
+ /* complete thread pool */
+ ags_thread_pool_start(ags_thread_application_context->thread_pool);
+ }
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
- }else{
- AgsSingleThread *single_thread;
+ if(!single_thread){
+ AgsGuiThread *gui_thread;
+ GList *list;
- devout = ags_devout_new((GObject *) ags_main);
- ags_main_add_devout(ags_main,
- devout);
+ /* find gui thread */
+ list = AGS_THREAD(application_context->main_loop)->children;
- g_object_set(G_OBJECT(ags_main->autosave_thread),
- "devout\0", devout,
- NULL);
+ while(list != NULL){
+ if(AGS_IS_GUI_THREAD(list->data)){
+ gui_thread = list->data;
- /* threads */
- single_thread = ags_single_thread_new((GObject *) devout);
+ break;
+ }
- /* AgsWindow */
- ags_main->window =
- window = ags_window_new((GObject *) ags_main);
- g_object_set(G_OBJECT(window),
- "devout\0", devout,
- NULL);
- gtk_window_set_default_size((GtkWindow *) window, 500, 500);
- gtk_paned_set_position((GtkPaned *) window->paned, 300);
-
- ags_connectable_connect(window);
- gtk_widget_show_all((GtkWidget *) window);
-
- /* AgsMainLoop */
- ags_main->main_loop = AGS_MAIN_LOOP(ags_audio_loop_new((GObject *) devout, (GObject *) ags_main));
- g_object_ref(G_OBJECT(ags_main->main_loop));
-
- /* complete thread pool */
- ags_main->thread_pool->parent = AGS_THREAD(ags_main->main_loop);
- ags_thread_pool_start(ags_main->thread_pool);
-
- /* start thread tree */
- ags_thread_start((AgsThread *) single_thread);
+ list = list->next;
}
- if(!single_thread){
- /* join gui thread */
+ /* start main loop */
+ ags_thread_start(AGS_THREAD(application_context->main_loop));
+
+ /* join gui thread */
#ifdef _USE_PTH
- pth_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
+ pth_join(gui_thread->thread,
+ NULL);
#else
- pthread_join(AGS_AUDIO_LOOP(ags_main->main_loop)->gui_thread->thread,
- NULL);
+ pthread_join(gui_thread->thread,
+ NULL);
#endif
- }
- }
+ }else{
+ AgsSingleThread *single_thread;
+ /* single thread */
+ single_thread = ags_single_thread_new((GObject *) ags_audio_application_context->soundcard->data);
+
+ /* start thread tree */
+ ags_thread_start((AgsThread *) single_thread);
+ }
+
/* free managers */
if(ags_ladspa_manager != NULL){
g_object_unref(ags_ladspa_manager_get_instance());
}
-
- uid = getuid();
- pw = getpwuid(uid);
+ /* delete autosave file */
autosave_filename = g_strdup_printf("%s/%s/%d-%s\0",
pw->pw_dir,
AGS_DEFAULT_DIRECTORY,
diff --git a/src/ags/object/ags_application_context.c b/src/ags/object/ags_application_context.c
index 3644d60..ecddaa4 100644
--- a/src/ags/object/ags_application_context.c
+++ b/src/ags/object/ags_application_context.c
@@ -60,7 +60,6 @@ enum{
};
static gpointer ags_application_context_parent_class = NULL;
-
static guint application_context_signals[LAST_SIGNAL];
AgsApplicationContext *ags_application_context = NULL;
diff --git a/src/ags/object/ags_init.c b/src/ags/object/ags_init.c
index dc1ed56..788ad83 100644
--- a/src/ags/object/ags_init.c
+++ b/src/ags/object/ags_init.c
@@ -16,3 +16,25 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <ags/object/ags_init.h>
+
+#include <ags/object/ags_config.h>
+
+extern AgsApplicationContext *ags_application_context = NULL;
+
+extern AgsConfig *ags_config;
+
+void
+ags_init_context(int *argc, gchar ***argv)
+{
+ gchar *filename;
+
+ LIBXML_TEST_VERSION;
+
+ /* instantiate config */
+ ags_config = ags_config_new();
+
+ /* instantiate application context */
+ ags_audio_application_context = ags_audio_application_context_new(NULL,
+ ags_config);
+}
diff --git a/src/ags/object/ags_init.c b/src/ags/object/ags_init.c~
similarity index 100%
copy from src/ags/object/ags_init.c
copy to src/ags/object/ags_init.c~
diff --git a/src/ags/object/ags_init.h b/src/ags/object/ags_init.h
index 72e16b2..9963484 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/object/ags_init.h
@@ -19,6 +19,9 @@
#ifndef __AGS_INIT_H__
#define __AGS_INIT_H__
+#include <glib.h>
#include <glib-object.h>
+void ags_init_context(int *argc, gchar ***argv);
+
#endif /*__AGS_INIT_H__*/
diff --git a/src/ags/server/ags_server_application_cotext.c b/src/ags/server/ags_server_application_cotext.c
deleted file mode 100644
index a8de5a4..0000000
--- a/src/ags/server/ags_server_application_cotext.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2015 Joël Krähemann
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <ags-lib/object/ags_connectable.h>
-
-void ags_server_application_context_class_init(AgsServerApplicationContextClass *server_application_context);
-void ags_server_application_context_connectable_interface_init(AgsConnectableInterface *connectable);
-void ags_server_application_context_init(AgsServerApplicationContext *server_application_context);
-void ags_server_application_context_set_property(GObject *gobject,
- guint prop_id,
- const GValue *value,
- GParamSpec *param_spec);
-void ags_server_application_context_get_property(GObject *gobject,
- guint prop_id,
- GValue *value,
- GParamSpec *param_spec);
-void ags_server_application_context_connect(AgsConnectable *connectable);
-void ags_server_application_context_disconnect(AgsConnectable *connectable);
-void ags_server_application_context_finalize(GObject *gobject);
-
-static AgsConnectableInterface* ags_server_application_context_parent_connectable_interface;
-
-GType
-ags_server_application_context_get_type()
-{
- static GType ags_type_server_application_context = 0;
-
- if(!ags_type_server_application_context){
- static const GTypeInfo ags_server_application_context_info = {
- sizeof (AgsServerApplicationContextClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) ags_server_application_context_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (AgsServerApplicationContext),
- 0, /* n_preallocs */
- (GInstanceInitFunc) ags_server_application_context_init,
- };
-
- static const GInterfaceInfo ags_connectable_interface_info = {
- (GInterfaceInitFunc) ags_server_application_context_connectable_interface_init,
- NULL, /* interface_finalize */
- NULL, /* interface_data */
- };
-
- ags_type_server_application_context = g_type_register_static(AGS_TYPE_APPLICATION_CONTEXT,
- "AgsServerApplicationContext\0",
- &ags_server_application_context_info,
- 0);
-
- g_type_add_interface_static(ags_type_server_application_context,
- AGS_TYPE_CONNECTABLE,
- &ags_connectable_interface_info);
- }
-
- return (ags_type_server_application_context);
-}
-
-void
-ags_server_application_context_class_init(AgsServerApplicationContextClass *server_application_context)
-{
- GObjectClass *gobject;
- AgsApplicationContextClass *application_context;
-
- ags_server_application_context_parent_class = g_type_class_peek_parent(ags_server_application_context);
-
- /* GObjectClass */
- gobject = (GObjectClass *) ags_server_application_context;
-
- gobject->set_property = ags_server_application_context_set_property;
- gobject->get_property = ags_server_application_context_get_property;
-
- gobject->finalize = ags_server_application_context_finalize;
-
- /* AgsServerApplicationContextClass */
- application_context = (AgsApplicationContextClass *) server_application_context_class;
-
- application_context->load_config = ags_server_application_context_load_config;
- application_context->register_types = ags_server_application_context_register_types;
-}
-
-void
-ags_server_application_context_connectable_interface_init(AgsConnectableInterface *connectable)
-{
- ags_server_application_context_parent_connectable_interface = g_type_interface_peek_parent(connectable);
-
- connectable->connect = ags_server_application_context_connect;
- connectable->disconnect = ags_server_application_context_disconnect;
-}
-
-void
-ags_server_application_context_init(AgsServerApplicationContext *server_application_context)
-{
- server_application_context->flags = 0;
-
- application_context->server = NULL;
-}
-
-void
-ags_server_application_context_set_property(GObject *gobject,
- guint prop_id,
- const GValue *value,
- GParamSpec *param_spec)
-{
- AgsServerApplicationContext *server_application_context;
-
- server_application_context = AGS_SERVER_APPLICATION_CONTEXT(gobject);
-
- switch(prop_id){
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, param_spec);
- break;
- }
-}
-
-void
-ags_server_application_context_get_property(GObject *gobject,
- guint prop_id,
- GValue *value,
- GParamSpec *param_spec)
-{
- AgsServerApplicationContext *server_application_context;
-
- server_application_context = AGS_SERVER_APPLICATION_CONTEXT(gobject);
-
- switch(prop_id){
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, param_spec);
- break;
- }
-}
-
-void
-ags_server_application_context_connect(AgsConnectable *connectable)
-{
- AgsServerApplicationContext *server_application_context;
-
- server_application_context = AGS_SERVER_APPLICATION_CONTEXT(connectable);
-
- if((AGS_SERVER_APPLICATION_CONTEXT_CONNECTED & (server_application_context->flags)) != 0){
- return;
- }
-
- ags_server_application_context_parent_connectable_interface->connect(connectable);
-}
-
-void
-ags_server_application_context_disconnect(AgsConnectable *connectable)
-{
- AgsServerApplicationContext *server_application_context;
-
- server_application_context = AGS_SERVER_APPLICATION_CONTEXT(connectable);
-
- if((AGS_SERVER_APPLICATION_CONTEXT_CONNECTED & (server_application_context->flags)) == 0){
- return;
- }
-
- ags_server_application_context_parent_connectable_interface->disconnect(connectable);
-}
-
-void
-ags_server_application_context_finalize(GObject *gobject)
-{
- AgsServerApplicationContext *server_application_context;
-
- G_OBJECT_CLASS(ags_server_application_context_parent_class)->finalize(gobject);
-
- server_application_context = AGS_SERVER_APPLICATION_CONTEXT(gobject);
-}
-
-AgsServerApplicationContext*
-ags_server_application_context_new(AgsMainLoop *main_loop,
- AgsConfig *config)
-{
- AgsServerApplicationContext *server_application_context;
-
- server_application_context = (AgsServerApplicationContext *) g_object_new(AGS_TYPE_SERVER_APPLICATION_CONTEXT,
- "main-loop\0", main_loop,
- "config\0", config,
- NULL);
-
- return(server_application_context);
-}
diff --git a/src/ags/X/ags_effect_bridge_callbacks.c b/src/ags/server/ags_server_init.c
similarity index 56%
copy from src/ags/X/ags_effect_bridge_callbacks.c
copy to src/ags/server/ags_server_init.c
index 1186a7e..24974d3 100644
--- a/src/ags/X/ags_effect_bridge_callbacks.c
+++ b/src/ags/server/ags_server_init.c
@@ -16,25 +16,27 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/ags_effect_bridge_callbacks.h>
+#include <ags/server/ags_server_init.h>
+
+#include <ags/object/ags_application_context.h>
+
+extern AgsApplicationContext *ags_application_context = NULL;
+extern AgsServerApplicationContext *ags_server_application_context;
void
-ags_effect_bridge_set_audio_channels_callback(AgsAudio *audio,
- guint audio_channels, guint audio_channels_old,
- AgsEffectBridge *effect_bridge)
+ags_server_init_context(int *argc, gchar ***argv)
{
- ags_effect_bridge_resize_audio_channels(effect_bridge,
- audio_channels, audio_channels_old);
-}
+ const char *error;
-void
-ags_effect_bridge_set_pads_callback(AgsAudio *audio,
- GType channel_type,
- guint pads, guint pads_old,
- AgsEffectBridge *effect_bridge)
-{
- ags_effect_bridge_resize_pads(effect_bridge,
- channel_type,
- pads, pads_old);
-}
+#ifdef AGS_WITH_XMLRPC_C
+ AbyssInit(&error);
+
+ xmlrpc_env_init(&(ags_main->env));
+#endif
+ /* instantiate application context */
+ ags_server_application_context = ags_server_application_context_new(NULL,
+ NULL);
+ ags_application_context_add_sibling(ags_application_context,
+ ags_server_application_context);
+}
diff --git a/src/ags/server/ags_server_init.c~ b/src/ags/server/ags_server_init.c~
new file mode 100644
index 0000000..d48ffd4
--- /dev/null
+++ b/src/ags/server/ags_server_init.c~
@@ -0,0 +1,5 @@
+#ifdef AGS_WITH_XMLRPC_C
+ AbyssInit(&error);
+
+ xmlrpc_env_init(&(ags_main->env));
+#endif /* AGS_WITH_XMLRPC_C */
diff --git a/src/ags/X/ags_effect_pad_callbacks.h b/src/ags/server/ags_server_init.h
similarity index 82%
copy from src/ags/X/ags_effect_pad_callbacks.h
copy to src/ags/server/ags_server_init.h
index af7c25f..e86bf0f 100644
--- a/src/ags/X/ags_effect_pad_callbacks.h
+++ b/src/ags/server/ags_server_init.h
@@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_EFFECT_PAD_CALLBACKS_H__
-#define __AGS_EFFECT_PAD_CALLBACKS_H__
+#ifndef __AGS_SERVER_INIT_H__
+#define __AGS_SERVER_INIT_H__
-#include <glib.h>
#include <glib-object.h>
+#include <glib-object.h>
+
#include <gtk/gtk.h>
-#include <ags/X/ags_effect_pad.h>
+void ags_server_init_context(int *argc, gchar ***argv);
-#endif /*__AGS_EFFECT_PAD_CALLBACKS_H__*/
+#endif /*__AGS_SERVER_INIT_H__*/
diff --git a/src/ags/thread/ags_single_thread.c b/src/ags/thread/ags_single_thread.c
index acb6523..e0f9628 100644
--- a/src/ags/thread/ags_single_thread.c
+++ b/src/ags/thread/ags_single_thread.c
@@ -20,8 +20,6 @@
#include <ags-lib/object/ags_connectable.h>
-#include <ags/audio/ags_devout.h>
-
void ags_single_thread_class_init(AgsSingleThreadClass *single_thread);
void ags_single_thread_connectable_interface_init(AgsConnectableInterface *connectable);
void ags_single_thread_init(AgsSingleThread *single_thread);
@@ -108,23 +106,7 @@ ags_single_thread_connectable_interface_init(AgsConnectableInterface *connectabl
void
ags_single_thread_init(AgsSingleThread *single_thread)
{
- AgsThread *thread;
- AgsAudioLoop *audio_loop;
-
- thread = AGS_THREAD(single_thread);
-
- audio_loop =
- single_thread->audio_loop = ags_audio_loop_new(NULL, NULL);
- AGS_THREAD(single_thread->audio_loop)->flags |= AGS_THREAD_SINGLE_LOOP;
-
- single_thread->task_thread = AGS_TASK_THREAD(audio_loop->task_thread);
- AGS_THREAD(single_thread->task_thread)->flags |= AGS_THREAD_SINGLE_LOOP;
-
- single_thread->devout_thread = AGS_DEVOUT_THREAD(audio_loop->devout_thread);
- AGS_THREAD(single_thread->task_thread)->flags |= AGS_THREAD_SINGLE_LOOP;
-
- single_thread->gui_thread = AGS_GUI_THREAD(audio_loop->gui_thread);
- AGS_THREAD(single_thread->gui_thread)->flags |= AGS_THREAD_SINGLE_LOOP;
+ /* empty */
}
void
@@ -155,44 +137,14 @@ void
ags_single_thread_start(AgsThread *thread)
{
AgsSingleThread *single_thread;
- AgsDevout *devout;
single_thread = AGS_SINGLE_THREAD(thread);
- devout = AGS_DEVOUT(thread->devout);
- devout->flags |= AGS_DEVOUT_NONBLOCKING;
-
- g_object_set(G_OBJECT(single_thread->audio_loop),
- "devout\0", devout,
- NULL);
-
- g_object_set(G_OBJECT(single_thread->task_thread),
- "devout\0", devout,
- NULL);
-
- g_object_set(G_OBJECT(single_thread->devout_thread),
- "devout\0", devout,
- NULL);
-
- g_object_set(G_OBJECT(single_thread->gui_thread),
- "devout\0", devout,
- NULL);
-
g_atomic_int_or(&(thread->flags),
(AGS_THREAD_RUNNING |
AGS_THREAD_INITIAL_RUN));
ags_single_thread_run(thread);
-
- // pthread_create(&(AGS_THREAD(single_thread)->thread), NULL,
- // &(ags_single_thread_loop), thread);
-
- ags_thread_start((AgsThread *) single_thread->audio_loop);
-
- ags_thread_start((AgsThread *) single_thread->task_thread);
-
- ags_thread_start((AgsThread *) single_thread->gui_thread);
-
}
void*
@@ -207,6 +159,9 @@ void
ags_single_thread_run(AgsThread *thread)
{
AgsSingleThread *single_thread;
+
+ GList *list;
+
struct timespec play_start, play_exceeded, play_idle, current;
single_thread = AGS_SINGLE_THREAD(thread);
@@ -218,17 +173,14 @@ ags_single_thread_run(AgsThread *thread)
/* initial value to calculate timing */
clock_gettime(CLOCK_MONOTONIC, &play_start);
- /* */
- ags_thread_run((AgsThread *) single_thread->audio_loop);
+ list = single_thread->children;
- ags_thread_run((AgsThread *) single_thread->task_thread);
+ while(list != NULL){
+ ags_thread_run(AGS_THREAD(list->data));
- if((AGS_THREAD_RUNNING & (AGS_THREAD(single_thread->devout_thread)->flags)) != 0){
- ags_thread_run((AgsThread *) single_thread->devout_thread);
+ list = list->next;
}
-
- ags_thread_run((AgsThread *) single_thread->gui_thread);
-
+
/* do timing */
clock_gettime(CLOCK_MONOTONIC, &play_exceeded);
diff --git a/src/ags/thread/ags_single_thread.h b/src/ags/thread/ags_single_thread.h
index 51334a7..9478c2c 100644
--- a/src/ags/thread/ags_single_thread.h
+++ b/src/ags/thread/ags_single_thread.h
@@ -28,11 +28,6 @@
#include <ags/thread/ags_thread-posix.h>
#endif
-#include <ags/thread/ags_audio_loop.h>
-#include <ags/thread/ags_devout_thread.h>
-#include <ags/thread/ags_task_thread.h>
-#include <ags/thread/ags_gui_thread.h>
-
#include <unistd.h>
#define AGS_TYPE_SINGLE_THREAD (ags_single_thread_get_type())
@@ -50,11 +45,6 @@ typedef struct _AgsSingleThreadClass AgsSingleThreadClass;
struct _AgsSingleThread
{
AgsThread thread;
-
- AgsAudioLoop *audio_loop;
- AgsDevoutThread *devout_thread;
- AgsTaskThread *task_thread;
- AgsGuiThread *gui_thread;
};
struct _AgsSingleThreadClass
diff --git a/src/ags/thread/ags_thread_application_context.c b/src/ags/thread/ags_thread_application_context.c
index 6f32848..b5f3b95 100644
--- a/src/ags/thread/ags_thread_application_context.c
+++ b/src/ags/thread/ags_thread_application_context.c
@@ -56,6 +56,7 @@ enum{
PROP_THREAD_POOL,
};
+AgsThreadApplicationContext *ags_thread_application_context = NULL;
extern AgsConfig *ags_config;
GType
@@ -168,12 +169,10 @@ ags_thread_application_context_init(AgsThreadApplicationContext *thread_applicat
{
thread_application_context->flags = 0;
- /* AgsAutosaveThread */
- thread_application_context->autosave_thread = NULL;
- thread_application_context->autosave_thread = ags_autosave_thread_new(NULL, thread_application_context);
- g_object_ref(G_OBJECT(thread_application_context->autosave_thread));
-
- thread_application_context->thread_pool = ags_thread_pool_new(NULL);
+ g_object_set(thread_application_context,
+ "autosave-thread", ags_autosave_thread_new(NULL, NULL),
+ "thread-pool\0", ags_thread_pool_new(NULL),
+ NULL);
}
void
diff --git a/src/ags/X/machine/ags_ffplayer_input_line_callbacks.c b/src/ags/thread/ags_thread_init.c
similarity index 57%
copy from src/ags/X/machine/ags_ffplayer_input_line_callbacks.c
copy to src/ags/thread/ags_thread_init.c
index 37c3377..ed35f86 100644
--- a/src/ags/X/machine/ags_ffplayer_input_line_callbacks.c
+++ b/src/ags/thread/ags_thread_init.c
@@ -16,19 +16,24 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/machine/ags_ffplayer_input_line_callbacks.h>
+#include <ags/thread/ags_thread_init.h>
+
+#include <ags/object/ags_init.h>
+#include <ags/object/ags_application_context.h>
+
+extern AgsApplicationContext *ags_application_context = NULL;
+extern AgsThreadApplicationContext *ags_thread_application_context;
void
-ags_ffplayer_input_line_notify_channel_callback(GObject *gobject,
- GParamSpec *pspec,
- gpointer user_data)
+ags_thread_init_context(int *argc, gchar ***argv)
{
- AgsFFPlayerInputLine *ffplayer_input_line;
+ ags_init_context(argc, argv);
+
+ g_thread_init(NULL);
- ffplayer_input_line = AGS_FFPLAYER_INPUT_LINE(gobject);
- gtk_label_set_text(AGS_EFFECT_LINE(ffplayer_input_line)->label,
- g_strdup_printf("in:%d,%d",
- AGS_EFFECT_LINE(ffplayer_input_line)->channel->pad,
- AGS_EFFECT_LINE(ffplayer_input_line)->channel->audio_channel));
+ /* instantiate application context */
+ ags_thread_application_context = ags_thread_application_context_new(NULL,
+ NULL);
+ ags_application_context_add_sibling(ags_application_context,
+ ags_thread_application_context);
}
-
diff --git a/src/ags/X/machine/ags_ladspa_bridge_callbacks.c b/src/ags/thread/ags_thread_init.c~
similarity index 87%
copy from src/ags/X/machine/ags_ladspa_bridge_callbacks.c
copy to src/ags/thread/ags_thread_init.c~
index cf09835..c03908c 100644
--- a/src/ags/X/machine/ags_ladspa_bridge_callbacks.c
+++ b/src/ags/thread/ags_thread_init.c~
@@ -16,5 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <ags/X/machine/ags_ladspa_bridge_callbacks.h>
+#include <ags/thread/ags_thread_init.h>
+void
+ags_thread_init(int *argc, gchar ***argv)
+{
+ ao_initialize();
+}
diff --git a/src/ags/object/ags_init.h b/src/ags/thread/ags_thread_init.h
similarity index 82%
copy from src/ags/object/ags_init.h
copy to src/ags/thread/ags_thread_init.h
index 72e16b2..eb8dc76 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/thread/ags_thread_init.h
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#ifndef __AGS_THREAD_INIT_H__
+#define __AGS_THREAD_INIT_H__
+#include <glib.h>
#include <glib-object.h>
-#endif /*__AGS_INIT_H__*/
+void ags_thread_init_context(int *argc, gchar ***argv);
+
+#endif /*__AGS_THREAD_INIT_H__*/
diff --git a/src/ags/object/ags_init.h b/src/ags/thread/ags_thread_init.h~
similarity index 83%
copy from src/ags/object/ags_init.h
copy to src/ags/thread/ags_thread_init.h~
index 72e16b2..5d7520c 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/thread/ags_thread_init.h~
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#ifndef __AGS_THREAD_INIT_H__
+#define __AGS_THREAD_INIT_H__
+#include <glib.h>
#include <glib-object.h>
-#endif /*__AGS_INIT_H__*/
+void ags_thread_init(int *argc, gchar ***argv);
+
+#endif /*__AGS_THREAD_INIT_H__*/
diff --git a/src/ags/object/ags_init.h b/src/ags/widget/ags_gui_init.c
similarity index 83%
copy from src/ags/object/ags_init.h
copy to src/ags/widget/ags_gui_init.c
index 72e16b2..fd3faee 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/widget/ags_gui_init.c
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#include <ags/widget/ags_gui_init.h>
-#include <glib-object.h>
+#include <ags/thread/ags_thread_init.h>
-#endif /*__AGS_INIT_H__*/
+void
+ags_gui_init_context(int *argc, gchar ***argv)
+{
+ gtk_init(argc, argv);
+}
diff --git a/src/ags/widget/ags_gui_init.c~ b/src/ags/widget/ags_gui_init.c~
new file mode 100644
index 0000000..f423560
--- /dev/null
+++ b/src/ags/widget/ags_gui_init.c~
@@ -0,0 +1 @@
+ gtk_init(argc, argv);
diff --git a/src/ags/X/ags_effect_pad_callbacks.h b/src/ags/widget/ags_gui_init.h
similarity index 84%
copy from src/ags/X/ags_effect_pad_callbacks.h
copy to src/ags/widget/ags_gui_init.h
index af7c25f..2ad3d43 100644
--- a/src/ags/X/ags_effect_pad_callbacks.h
+++ b/src/ags/widget/ags_gui_init.h
@@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_EFFECT_PAD_CALLBACKS_H__
-#define __AGS_EFFECT_PAD_CALLBACKS_H__
+#ifndef __AGS_GUI_INIT_H__
+#define __AGS_GUI_INIT_H__
#include <glib.h>
#include <glib-object.h>
+
#include <gtk/gtk.h>
-#include <ags/X/ags_effect_pad.h>
+void ags_gui_init_context(int *argc, gchar ***argv);
-#endif /*__AGS_EFFECT_PAD_CALLBACKS_H__*/
+#endif /*__AGS_GUI_INIT_H__*/
diff --git a/src/ags/object/ags_init.h b/src/ags/widget/ags_gui_init.h~
similarity index 84%
copy from src/ags/object/ags_init.h
copy to src/ags/widget/ags_gui_init.h~
index 72e16b2..4f89d3a 100644
--- a/src/ags/object/ags_init.h
+++ b/src/ags/widget/ags_gui_init.h~
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __AGS_INIT_H__
-#define __AGS_INIT_H__
+#ifndef __AGS_GUI_INIT_H__
+#define __AGS_GUI_INIT_H__
+#include <glib.h>
#include <glib-object.h>
-#endif /*__AGS_INIT_H__*/
+void ags_gui_init(int *argc, gchar ***argv);
+
+#endif /*__AGS_GUI_INIT_H__*/
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list