[SCM] gsequencer/upstream: fixed missing soundcard in window
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:06:56 UTC 2015
The following commit has been merged in the upstream branch:
commit 8c0ae015a0a536ae173f78d67e12149528ff864a
Author: Joël Krähemann <weedlight at gmail.com>
Date: Tue Apr 7 19:45:49 2015 +0000
fixed missing soundcard in window
diff --git a/.deps/gsequencer-ags_menu_bar_callbacks.Po b/.deps/gsequencer-ags_menu_bar_callbacks.Po
index cf8e4fa..e65b033 100644
--- a/.deps/gsequencer-ags_menu_bar_callbacks.Po
+++ b/.deps/gsequencer-ags_menu_bar_callbacks.Po
@@ -551,50 +551,20 @@ gsequencer-ags_menu_bar_callbacks.o: src/ags/X/ags_menu_bar_callbacks.c \
/usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
/usr/include/libxml2/libxml/xlink.h /usr/include/libxml2/libxml/SAX2.h \
src/ags-lib/object/ags_connectable.h src/ags/object/ags_applicable.h \
- src/ags/object/ags_soundcard.h src/ags/audio/ags_input.h \
- /usr/include/glib-2.0/glib/gstdio.h /usr/include/glib-2.0/glib/gprintf.h \
- /usr/include/sys/stat.h /usr/include/bits/stat.h \
- src/ags/audio/ags_channel.h src/ags/audio/ags_recall_id.h \
- src/ags/audio/ags_recycling.h src/ags/audio/ags_audio_signal.h \
- src/ags/audio/ags_recycling_container.h src/ags/audio/ags_recall.h \
- src/ags/audio/ags_port.h /usr/include/ladspa.h \
- src/ags/audio/ags_recall_dependency.h src/ags/audio/ags_notation.h \
- src/ags/thread/ags_timestamp_thread.h src/ags/thread/ags_thread-posix.h \
+ src/ags/object/ags_soundcard.h src/ags/thread/ags_thread-posix.h \
+ src/ags/thread/ags_task_thread.h src/ags/thread/ags_thread_pool.h \
+ src/ags/object/ags_main_loop.h src/ags/audio/ags_task.h \
+ src/ags/audio/ags_input.h /usr/include/glib-2.0/glib/gstdio.h \
+ /usr/include/glib-2.0/glib/gprintf.h /usr/include/sys/stat.h \
+ /usr/include/bits/stat.h src/ags/audio/ags_channel.h \
+ src/ags/audio/ags_recall_id.h src/ags/audio/ags_recycling.h \
+ src/ags/audio/ags_audio_signal.h src/ags/audio/ags_recycling_container.h \
+ src/ags/audio/ags_recall.h src/ags/audio/ags_port.h \
+ /usr/include/ladspa.h src/ags/audio/ags_recall_dependency.h \
+ src/ags/audio/ags_notation.h src/ags/thread/ags_timestamp_thread.h \
src/ags/audio/ags_timestamp.h src/ags/audio/ags_note.h \
src/ags/audio/ags_output.h src/ags/audio/task/ags_save_file.h \
- src/ags/audio/ags_task.h src/ags/audio/task/ags_add_audio.h \
- src/ags/audio/ags_devout.h /usr/include/alsa/asoundlib.h \
- /usr/include/string.h /usr/include/bits/string.h \
- /usr/include/bits/string2.h /usr/include/fcntl.h \
- /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h \
- /usr/include/assert.h /usr/include/sys/poll.h /usr/include/bits/poll.h \
- /usr/include/errno.h /usr/include/bits/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
- /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \
- /usr/include/alsa/global.h /usr/include/alsa/input.h \
- /usr/include/alsa/output.h /usr/include/alsa/error.h \
- /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \
- /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \
- /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \
- /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \
- /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \
- /usr/include/alsa/seq_midi_event.h src/ags/thread/ags_audio_loop.h \
- /usr/include/math.h /usr/include/bits/huge_val.h \
- /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
- /usr/include/bits/inf.h /usr/include/bits/nan.h \
- /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
- /usr/include/bits/mathinline.h src/ags/thread/ags_async_queue.h \
- /usr/include/linux/futex.h /usr/include/linux/types.h \
- /usr/include/asm/types.h /usr/include/asm-generic/types.h \
- /usr/include/asm-generic/int-ll64.h /usr/include/asm/bitsperlong.h \
- /usr/include/asm-generic/bitsperlong.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/include/asm/posix_types_64.h /usr/include/asm-generic/posix_types.h \
- /usr/include/sys/time.h src/ags/object/ags_stackable.h \
- src/ags/thread/ags_task_thread.h src/ags/thread/ags_thread_pool.h \
- src/ags/object/ags_main_loop.h src/ags/thread/ags_devout_thread.h \
- src/ags/thread/ags_iterator_thread.h src/ags/audio/ags_audio.h \
+ src/ags/audio/task/ags_add_audio.h src/ags/audio/ags_audio.h \
src/ags/X/ags_window.h src/ags/X/ags_automation_editor.h \
src/ags/X/editor/ags_automation_toolbar.h \
src/ags/X/editor/ags_port_selection.h src/ags/X/editor/ags_notebook.h \
@@ -1986,6 +1956,16 @@ src/ags/object/ags_applicable.h:
src/ags/object/ags_soundcard.h:
+src/ags/thread/ags_thread-posix.h:
+
+src/ags/thread/ags_task_thread.h:
+
+src/ags/thread/ags_thread_pool.h:
+
+src/ags/object/ags_main_loop.h:
+
+src/ags/audio/ags_task.h:
+
src/ags/audio/ags_input.h:
/usr/include/glib-2.0/glib/gstdio.h:
@@ -2018,8 +1998,6 @@ src/ags/audio/ags_notation.h:
src/ags/thread/ags_timestamp_thread.h:
-src/ags/thread/ags_thread-posix.h:
-
src/ags/audio/ags_timestamp.h:
src/ags/audio/ags_note.h:
@@ -2028,138 +2006,8 @@ src/ags/audio/ags_output.h:
src/ags/audio/task/ags_save_file.h:
-src/ags/audio/ags_task.h:
-
src/ags/audio/task/ags_add_audio.h:
-src/ags/audio/ags_devout.h:
-
-/usr/include/alsa/asoundlib.h:
-
-/usr/include/string.h:
-
-/usr/include/bits/string.h:
-
-/usr/include/bits/string2.h:
-
-/usr/include/fcntl.h:
-
-/usr/include/bits/fcntl.h:
-
-/usr/include/bits/fcntl-linux.h:
-
-/usr/include/assert.h:
-
-/usr/include/sys/poll.h:
-
-/usr/include/bits/poll.h:
-
-/usr/include/errno.h:
-
-/usr/include/bits/errno.h:
-
-/usr/include/linux/errno.h:
-
-/usr/include/asm/errno.h:
-
-/usr/include/asm-generic/errno.h:
-
-/usr/include/asm-generic/errno-base.h:
-
-/usr/include/alsa/asoundef.h:
-
-/usr/include/alsa/version.h:
-
-/usr/include/alsa/global.h:
-
-/usr/include/alsa/input.h:
-
-/usr/include/alsa/output.h:
-
-/usr/include/alsa/error.h:
-
-/usr/include/alsa/conf.h:
-
-/usr/include/alsa/pcm.h:
-
-/usr/include/alsa/rawmidi.h:
-
-/usr/include/alsa/timer.h:
-
-/usr/include/alsa/hwdep.h:
-
-/usr/include/alsa/control.h:
-
-/usr/include/alsa/mixer.h:
-
-/usr/include/alsa/seq_event.h:
-
-/usr/include/alsa/seq.h:
-
-/usr/include/alsa/seqmid.h:
-
-/usr/include/alsa/seq_midi_event.h:
-
-src/ags/thread/ags_audio_loop.h:
-
-/usr/include/math.h:
-
-/usr/include/bits/huge_val.h:
-
-/usr/include/bits/huge_valf.h:
-
-/usr/include/bits/huge_vall.h:
-
-/usr/include/bits/inf.h:
-
-/usr/include/bits/nan.h:
-
-/usr/include/bits/mathdef.h:
-
-/usr/include/bits/mathcalls.h:
-
-/usr/include/bits/mathinline.h:
-
-src/ags/thread/ags_async_queue.h:
-
-/usr/include/linux/futex.h:
-
-/usr/include/linux/types.h:
-
-/usr/include/asm/types.h:
-
-/usr/include/asm-generic/types.h:
-
-/usr/include/asm-generic/int-ll64.h:
-
-/usr/include/asm/bitsperlong.h:
-
-/usr/include/asm-generic/bitsperlong.h:
-
-/usr/include/linux/posix_types.h:
-
-/usr/include/linux/stddef.h:
-
-/usr/include/asm/posix_types.h:
-
-/usr/include/asm/posix_types_64.h:
-
-/usr/include/asm-generic/posix_types.h:
-
-/usr/include/sys/time.h:
-
-src/ags/object/ags_stackable.h:
-
-src/ags/thread/ags_task_thread.h:
-
-src/ags/thread/ags_thread_pool.h:
-
-src/ags/object/ags_main_loop.h:
-
-src/ags/thread/ags_devout_thread.h:
-
-src/ags/thread/ags_iterator_thread.h:
-
src/ags/audio/ags_audio.h:
src/ags/X/ags_window.h:
diff --git a/.deps/libags_audio_a-ags_add_audio.Po b/.deps/libags_audio_a-ags_add_audio.Po
index c8b9896..5069a44 100644
--- a/.deps/libags_audio_a-ags_add_audio.Po
+++ b/.deps/libags_audio_a-ags_add_audio.Po
@@ -103,68 +103,7 @@ libags_audio_a-ags_add_audio.o: src/ags/audio/task/ags_add_audio.c \
/usr/include/glib-2.0/gobject/gtypeplugin.h \
/usr/include/glib-2.0/gobject/gvaluearray.h \
/usr/include/glib-2.0/gobject/gvaluetypes.h src/ags/audio/ags_task.h \
- src/ags/audio/ags_devout.h /usr/include/alsa/asoundlib.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/environments.h /usr/include/bits/confname.h \
- /usr/include/getopt.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
- /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h /usr/include/string.h \
- /usr/include/bits/string.h /usr/include/bits/string2.h \
- /usr/include/fcntl.h /usr/include/bits/fcntl.h \
- /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h \
- /usr/include/assert.h /usr/include/sys/poll.h /usr/include/bits/poll.h \
- /usr/include/errno.h /usr/include/bits/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
- /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \
- /usr/include/alsa/global.h /usr/include/alsa/input.h \
- /usr/include/alsa/output.h /usr/include/alsa/error.h \
- /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \
- /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \
- /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \
- /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \
- /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \
- /usr/include/alsa/seq_midi_event.h src/ags/thread/ags_audio_loop.h \
- /usr/include/math.h /usr/include/bits/huge_val.h \
- /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
- /usr/include/bits/inf.h /usr/include/bits/nan.h \
- /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
- /usr/include/bits/mathinline.h src/ags/thread/ags_thread-posix.h \
- src/ags/thread/ags_async_queue.h /usr/include/linux/futex.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/asm-generic/types.h /usr/include/asm-generic/int-ll64.h \
- /usr/include/asm/bitsperlong.h /usr/include/asm-generic/bitsperlong.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h /usr/include/asm/posix_types_64.h \
- /usr/include/asm-generic/posix_types.h /usr/include/sys/time.h \
- src/ags/object/ags_stackable.h src/ags/thread/ags_task_thread.h \
- src/ags/thread/ags_thread_pool.h src/ags/object/ags_main_loop.h \
- src/ags/object/ags_application_context.h src/ags/lib/ags_log.h \
- src/ags/object/ags_config.h src/ags/file/ags_file.h \
- /usr/include/libxml2/libxml/tree.h \
- /usr/include/libxml2/libxml/xmlversion.h \
- /usr/include/libxml2/libxml/xmlexports.h \
- /usr/include/libxml2/libxml/xmlstring.h \
- /usr/include/libxml2/libxml/xmlregexp.h \
- /usr/include/libxml2/libxml/dict.h \
- /usr/include/libxml2/libxml/xmlmemory.h \
- /usr/include/libxml2/libxml/threads.h \
- /usr/include/libxml2/libxml/globals.h \
- /usr/include/libxml2/libxml/parser.h /usr/include/libxml2/libxml/hash.h \
- /usr/include/libxml2/libxml/valid.h \
- /usr/include/libxml2/libxml/xmlerror.h \
- /usr/include/libxml2/libxml/list.h \
- /usr/include/libxml2/libxml/xmlautomata.h \
- /usr/include/libxml2/libxml/entities.h \
- /usr/include/libxml2/libxml/encoding.h /usr/include/iconv.h \
- /usr/include/libxml2/libxml/xmlIO.h /usr/include/libxml2/libxml/SAX.h \
- /usr/include/libxml2/libxml/xlink.h /usr/include/libxml2/libxml/SAX2.h \
- src/ags/thread/ags_devout_thread.h src/ags/thread/ags_iterator_thread.h \
- src/ags/audio/ags_channel.h /usr/include/gtk-2.0/gtk/gtk.h \
+ src/ags/audio/ags_audio.h /usr/include/gtk-2.0/gtk/gtk.h \
/usr/include/gtk-2.0/gdk/gdk.h \
/usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h \
/usr/include/glib-2.0/gio/gio.h /usr/include/glib-2.0/gio/giotypes.h \
@@ -191,7 +130,9 @@ libags_audio_a-ags_add_audio.o: src/ags/audio/task/ags_add_audio.c \
/usr/include/glib-2.0/gio/gcontenttype.h \
/usr/include/glib-2.0/gio/gconverterinputstream.h \
/usr/include/glib-2.0/gio/gconverteroutputstream.h \
- /usr/include/glib-2.0/gio/gcredentials.h \
+ /usr/include/glib-2.0/gio/gcredentials.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
/usr/include/glib-2.0/gio/gdatainputstream.h \
/usr/include/glib-2.0/gio/gdataoutputstream.h \
/usr/include/glib-2.0/gio/gdbusaddress.h \
@@ -328,8 +269,10 @@ libags_audio_a-ags_add_audio.o: src/ags/audio/task/ags_add_audio.c \
/usr/include/pango-1.0/pango/pango-layout.h \
/usr/include/pango-1.0/pango/pango-tabs.h \
/usr/include/pango-1.0/pango/pango-renderer.h \
- /usr/include/pango-1.0/pango/pango-utils.h \
- /usr/lib/gtk-2.0/include/gdkconfig.h \
+ /usr/include/pango-1.0/pango/pango-utils.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/lib/gtk-2.0/include/gdkconfig.h \
/usr/include/gtk-2.0/gdk/gdkdisplay.h \
/usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
/usr/include/gtk-2.0/gdk/gdkdnd.h /usr/include/gtk-2.0/gdk/gdkinput.h \
@@ -583,13 +526,34 @@ libags_audio_a-ags_add_audio.o: src/ags/audio/task/ags_add_audio.c \
/usr/include/gtk-2.0/gtk/gtkoldeditable.h \
/usr/include/gtk-2.0/gtk/gtkoptionmenu.h \
/usr/include/gtk-2.0/gtk/gtkpreview.h \
- /usr/include/gtk-2.0/gtk/gtktipsquery.h src/ags/audio/ags_recall_id.h \
- src/ags/audio/ags_recycling.h src/ags/audio/ags_audio_signal.h \
- src/ags/audio/ags_recycling_container.h src/ags/audio/ags_recall.h \
- src/ags/audio/ags_port.h /usr/include/ladspa.h \
- src/ags/audio/ags_recall_dependency.h src/ags/audio/ags_notation.h \
- src/ags/thread/ags_timestamp_thread.h src/ags/audio/ags_timestamp.h \
- src/ags/audio/ags_note.h src/ags/audio/ags_audio.h \
+ /usr/include/gtk-2.0/gtk/gtktipsquery.h src/ags/audio/ags_channel.h \
+ src/ags/audio/ags_recall_id.h src/ags/audio/ags_recycling.h \
+ src/ags/audio/ags_audio_signal.h src/ags/audio/ags_recycling_container.h \
+ src/ags/audio/ags_recall.h src/ags/audio/ags_port.h \
+ /usr/include/ladspa.h src/ags/audio/ags_recall_dependency.h \
+ src/ags/audio/ags_notation.h /usr/include/libxml2/libxml/tree.h \
+ /usr/include/libxml2/libxml/xmlversion.h \
+ /usr/include/libxml2/libxml/xmlexports.h \
+ /usr/include/libxml2/libxml/xmlstring.h \
+ /usr/include/libxml2/libxml/xmlregexp.h \
+ /usr/include/libxml2/libxml/dict.h \
+ /usr/include/libxml2/libxml/xmlmemory.h \
+ /usr/include/libxml2/libxml/threads.h \
+ /usr/include/libxml2/libxml/globals.h \
+ /usr/include/libxml2/libxml/parser.h /usr/include/libxml2/libxml/hash.h \
+ /usr/include/libxml2/libxml/valid.h \
+ /usr/include/libxml2/libxml/xmlerror.h \
+ /usr/include/libxml2/libxml/list.h \
+ /usr/include/libxml2/libxml/xmlautomata.h \
+ /usr/include/libxml2/libxml/entities.h \
+ /usr/include/libxml2/libxml/encoding.h /usr/include/iconv.h \
+ /usr/include/libxml2/libxml/xmlIO.h /usr/include/libxml2/libxml/SAX.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/libxml2/libxml/xlink.h /usr/include/libxml2/libxml/SAX2.h \
+ src/ags/thread/ags_timestamp_thread.h src/ags/thread/ags_thread-posix.h \
+ src/ags/audio/ags_timestamp.h src/ags/audio/ags_note.h \
src/ags-lib/object/ags_connectable.h
/usr/include/stdc-predef.h:
@@ -874,227 +838,7 @@ src/ags/audio/task/ags_add_audio.h:
src/ags/audio/ags_task.h:
-src/ags/audio/ags_devout.h:
-
-/usr/include/alsa/asoundlib.h:
-
-/usr/include/unistd.h:
-
-/usr/include/bits/posix_opt.h:
-
-/usr/include/bits/environments.h:
-
-/usr/include/bits/confname.h:
-
-/usr/include/getopt.h:
-
-/usr/include/stdio.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/bits/waitflags.h:
-
-/usr/include/bits/waitstatus.h:
-
-/usr/include/alloca.h:
-
-/usr/include/bits/stdlib-bsearch.h:
-
-/usr/include/bits/stdlib-float.h:
-
-/usr/include/string.h:
-
-/usr/include/bits/string.h:
-
-/usr/include/bits/string2.h:
-
-/usr/include/fcntl.h:
-
-/usr/include/bits/fcntl.h:
-
-/usr/include/bits/fcntl-linux.h:
-
-/usr/include/bits/stat.h:
-
-/usr/include/assert.h:
-
-/usr/include/sys/poll.h:
-
-/usr/include/bits/poll.h:
-
-/usr/include/errno.h:
-
-/usr/include/bits/errno.h:
-
-/usr/include/linux/errno.h:
-
-/usr/include/asm/errno.h:
-
-/usr/include/asm-generic/errno.h:
-
-/usr/include/asm-generic/errno-base.h:
-
-/usr/include/alsa/asoundef.h:
-
-/usr/include/alsa/version.h:
-
-/usr/include/alsa/global.h:
-
-/usr/include/alsa/input.h:
-
-/usr/include/alsa/output.h:
-
-/usr/include/alsa/error.h:
-
-/usr/include/alsa/conf.h:
-
-/usr/include/alsa/pcm.h:
-
-/usr/include/alsa/rawmidi.h:
-
-/usr/include/alsa/timer.h:
-
-/usr/include/alsa/hwdep.h:
-
-/usr/include/alsa/control.h:
-
-/usr/include/alsa/mixer.h:
-
-/usr/include/alsa/seq_event.h:
-
-/usr/include/alsa/seq.h:
-
-/usr/include/alsa/seqmid.h:
-
-/usr/include/alsa/seq_midi_event.h:
-
-src/ags/thread/ags_audio_loop.h:
-
-/usr/include/math.h:
-
-/usr/include/bits/huge_val.h:
-
-/usr/include/bits/huge_valf.h:
-
-/usr/include/bits/huge_vall.h:
-
-/usr/include/bits/inf.h:
-
-/usr/include/bits/nan.h:
-
-/usr/include/bits/mathdef.h:
-
-/usr/include/bits/mathcalls.h:
-
-/usr/include/bits/mathinline.h:
-
-src/ags/thread/ags_thread-posix.h:
-
-src/ags/thread/ags_async_queue.h:
-
-/usr/include/linux/futex.h:
-
-/usr/include/linux/types.h:
-
-/usr/include/asm/types.h:
-
-/usr/include/asm-generic/types.h:
-
-/usr/include/asm-generic/int-ll64.h:
-
-/usr/include/asm/bitsperlong.h:
-
-/usr/include/asm-generic/bitsperlong.h:
-
-/usr/include/linux/posix_types.h:
-
-/usr/include/linux/stddef.h:
-
-/usr/include/asm/posix_types.h:
-
-/usr/include/asm/posix_types_64.h:
-
-/usr/include/asm-generic/posix_types.h:
-
-/usr/include/sys/time.h:
-
-src/ags/object/ags_stackable.h:
-
-src/ags/thread/ags_task_thread.h:
-
-src/ags/thread/ags_thread_pool.h:
-
-src/ags/object/ags_main_loop.h:
-
-src/ags/object/ags_application_context.h:
-
-src/ags/lib/ags_log.h:
-
-src/ags/object/ags_config.h:
-
-src/ags/file/ags_file.h:
-
-/usr/include/libxml2/libxml/tree.h:
-
-/usr/include/libxml2/libxml/xmlversion.h:
-
-/usr/include/libxml2/libxml/xmlexports.h:
-
-/usr/include/libxml2/libxml/xmlstring.h:
-
-/usr/include/libxml2/libxml/xmlregexp.h:
-
-/usr/include/libxml2/libxml/dict.h:
-
-/usr/include/libxml2/libxml/xmlmemory.h:
-
-/usr/include/libxml2/libxml/threads.h:
-
-/usr/include/libxml2/libxml/globals.h:
-
-/usr/include/libxml2/libxml/parser.h:
-
-/usr/include/libxml2/libxml/hash.h:
-
-/usr/include/libxml2/libxml/valid.h:
-
-/usr/include/libxml2/libxml/xmlerror.h:
-
-/usr/include/libxml2/libxml/list.h:
-
-/usr/include/libxml2/libxml/xmlautomata.h:
-
-/usr/include/libxml2/libxml/entities.h:
-
-/usr/include/libxml2/libxml/encoding.h:
-
-/usr/include/iconv.h:
-
-/usr/include/libxml2/libxml/xmlIO.h:
-
-/usr/include/libxml2/libxml/SAX.h:
-
-/usr/include/libxml2/libxml/xlink.h:
-
-/usr/include/libxml2/libxml/SAX2.h:
-
-src/ags/thread/ags_devout_thread.h:
-
-src/ags/thread/ags_iterator_thread.h:
-
-src/ags/audio/ags_channel.h:
+src/ags/audio/ags_audio.h:
/usr/include/gtk-2.0/gtk/gtk.h:
@@ -1156,6 +900,16 @@ src/ags/audio/ags_channel.h:
/usr/include/glib-2.0/gio/gcredentials.h:
+/usr/include/unistd.h:
+
+/usr/include/bits/posix_opt.h:
+
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
+
/usr/include/glib-2.0/gio/gdatainputstream.h:
/usr/include/glib-2.0/gio/gdataoutputstream.h:
@@ -1446,6 +1200,20 @@ src/ags/audio/ags_channel.h:
/usr/include/pango-1.0/pango/pango-utils.h:
+/usr/include/stdio.h:
+
+/usr/include/libio.h:
+
+/usr/include/_G_config.h:
+
+/usr/include/wchar.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/bits/sys_errlist.h:
+
+/usr/include/bits/stdio.h:
+
/usr/lib/gtk-2.0/include/gdkconfig.h:
/usr/include/gtk-2.0/gdk/gdkdisplay.h:
@@ -2008,6 +1776,8 @@ src/ags/audio/ags_channel.h:
/usr/include/gtk-2.0/gtk/gtktipsquery.h:
+src/ags/audio/ags_channel.h:
+
src/ags/audio/ags_recall_id.h:
src/ags/audio/ags_recycling.h:
@@ -2026,12 +1796,68 @@ src/ags/audio/ags_recall_dependency.h:
src/ags/audio/ags_notation.h:
+/usr/include/libxml2/libxml/tree.h:
+
+/usr/include/libxml2/libxml/xmlversion.h:
+
+/usr/include/libxml2/libxml/xmlexports.h:
+
+/usr/include/libxml2/libxml/xmlstring.h:
+
+/usr/include/libxml2/libxml/xmlregexp.h:
+
+/usr/include/libxml2/libxml/dict.h:
+
+/usr/include/libxml2/libxml/xmlmemory.h:
+
+/usr/include/libxml2/libxml/threads.h:
+
+/usr/include/libxml2/libxml/globals.h:
+
+/usr/include/libxml2/libxml/parser.h:
+
+/usr/include/libxml2/libxml/hash.h:
+
+/usr/include/libxml2/libxml/valid.h:
+
+/usr/include/libxml2/libxml/xmlerror.h:
+
+/usr/include/libxml2/libxml/list.h:
+
+/usr/include/libxml2/libxml/xmlautomata.h:
+
+/usr/include/libxml2/libxml/entities.h:
+
+/usr/include/libxml2/libxml/encoding.h:
+
+/usr/include/iconv.h:
+
+/usr/include/libxml2/libxml/xmlIO.h:
+
+/usr/include/libxml2/libxml/SAX.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
+/usr/include/alloca.h:
+
+/usr/include/bits/stdlib-bsearch.h:
+
+/usr/include/bits/stdlib-float.h:
+
+/usr/include/libxml2/libxml/xlink.h:
+
+/usr/include/libxml2/libxml/SAX2.h:
+
src/ags/thread/ags_timestamp_thread.h:
+src/ags/thread/ags_thread-posix.h:
+
src/ags/audio/ags_timestamp.h:
src/ags/audio/ags_note.h:
-src/ags/audio/ags_audio.h:
-
src/ags-lib/object/ags_connectable.h:
diff --git a/src/ags/X/ags_menu_bar_callbacks.c b/src/ags/X/ags_menu_bar_callbacks.c
index bc7e5bc..70260e1 100644
--- a/src/ags/X/ags_menu_bar_callbacks.c
+++ b/src/ags/X/ags_menu_bar_callbacks.c
@@ -25,6 +25,9 @@
#include <ags/file/ags_file.h>
+#include <ags/thread/ags_thread-posix.h>
+#include <ags/thread/ags_task_thread.h>
+
#include <ags/audio/ags_input.h>
#include <ags/audio/ags_output.h>
diff --git a/src/ags/audio/task/ags_add_audio.c b/src/ags/audio/task/ags_add_audio.c
index 5b4a888..7a1f8bc 100644
--- a/src/ags/audio/task/ags_add_audio.c
+++ b/src/ags/audio/task/ags_add_audio.c
@@ -31,12 +31,12 @@ void ags_add_audio_launch(AgsTask *task);
/**
* SECTION:ags_add_audio
- * @short_description: add audio object to devout
+ * @short_description: add audio object to soundcard
* @title: AgsAddAudio
* @section_id:
* @include: ags/audio/task/ags_add_audio.h
*
- * The #AgsAddAudio task adds #AgsAudio to #AgsDevout.
+ * The #AgsAddAudio task adds #AgsAudio to #AgsSoundcard.
*/
static gpointer ags_add_audio_parent_class = NULL;
@@ -110,7 +110,7 @@ ags_add_audio_connectable_interface_init(AgsConnectableInterface *connectable)
void
ags_add_audio_init(AgsAddAudio *add_audio)
{
- add_audio->devout = NULL;
+ add_audio->soundcard = NULL;
add_audio->audio = NULL;
}
@@ -145,8 +145,10 @@ ags_add_audio_launch(AgsTask *task)
add_audio = AGS_ADD_AUDIO(task);
+ //TODO:JK: use AgsSoundcard
+
/* add audio */
- ags_devout_add_audio(add_audio->devout,
+ ags_devout_add_audio(add_audio->soundcard,
G_OBJECT(add_audio->audio));
/* AgsAudio */
@@ -155,7 +157,7 @@ ags_add_audio_launch(AgsTask *task)
/**
* ags_add_audio_new:
- * @devout: the #AgsDevout
+ * @soundcard: the #AgsSoundcard
* @audio: the #AgsAudio to add
*
* Creates an #AgsAddAudio.
@@ -165,7 +167,7 @@ ags_add_audio_launch(AgsTask *task)
* Since: 0.4
*/
AgsAddAudio*
-ags_add_audio_new(AgsDevout *devout,
+ags_add_audio_new(GObject *soundcard,
AgsAudio *audio)
{
AgsAddAudio *add_audio;
@@ -173,7 +175,7 @@ ags_add_audio_new(AgsDevout *devout,
add_audio = (AgsAddAudio *) g_object_new(AGS_TYPE_ADD_AUDIO,
NULL);
- add_audio->devout = devout;
+ add_audio->soundcard = soundcard;
add_audio->audio = audio;
return(add_audio);
diff --git a/src/ags/audio/task/ags_add_audio.h b/src/ags/audio/task/ags_add_audio.h
index 9c52bf1..213d7b0 100644
--- a/src/ags/audio/task/ags_add_audio.h
+++ b/src/ags/audio/task/ags_add_audio.h
@@ -22,7 +22,6 @@
#include <glib-object.h>
#include <ags/audio/ags_task.h>
-#include <ags/audio/ags_devout.h>
#include <ags/audio/ags_audio.h>
#define AGS_TYPE_ADD_AUDIO (ags_add_audio_get_type())
@@ -39,7 +38,7 @@ struct _AgsAddAudio
{
AgsTask task;
- AgsDevout *devout;
+ GObject *soundcard;
AgsAudio *audio;
};
@@ -50,7 +49,7 @@ struct _AgsAddAudioClass
GType ags_add_audio_get_type();
-AgsAddAudio* ags_add_audio_new(AgsDevout *devout,
+AgsAddAudio* ags_add_audio_new(GObject *soundcard,
AgsAudio *audio);
#endif /*__AGS_ADD_AUDIO_H__*/
diff --git a/src/ags/main.c b/src/ags/main.c
index 86b87ed..502e17f 100644
--- a/src/ags/main.c
+++ b/src/ags/main.c
@@ -279,6 +279,9 @@ main(int argc, char **argv)
/* AgsWindow */
window = ags_window_new(application_context);
+ g_object_set(window,
+ "soundcard\0", soundcard,
+ NULL);
AGS_XORG_APPLICATION_CONTEXT(application_context)->window = window;
g_object_ref(G_OBJECT(window));
diff --git a/src/ags/thread/ags_task_thread.c b/src/ags/thread/ags_task_thread.c
index 28d0821..ee823ba 100644
--- a/src/ags/thread/ags_task_thread.c
+++ b/src/ags/thread/ags_task_thread.c
@@ -150,27 +150,14 @@ ags_task_thread_init(AgsTaskThread *task_thread)
g_atomic_pointer_set(&(task_thread->exec), NULL);
g_atomic_pointer_set(&(task_thread->queue),
NULL);
-
- task_thread->thread_pool = NULL;
}
void
ags_task_thread_connect(AgsConnectable *connectable)
{
- AgsThread *main_loop;
- AgsTaskThread *task_thread;
-
- AgsApplicationContext *application_context;
-
ags_task_thread_parent_connectable_interface->connect(connectable);
- task_thread = AGS_TASK_THREAD(connectable);
-
- main_loop = ags_thread_get_toplevel(task_thread);
-
- application_context = ags_main_loop_get_application_context(AGS_MAIN_LOOP(main_loop));
-
- task_thread->thread_pool = ags_concurrency_provider_get_thread_pool(AGS_CONCURRENCY_PROVIDER(application_context));
+ /* empty */
}
void
@@ -354,12 +341,22 @@ ags_task_thread_append_task_queue(AgsReturnableThread *returnable_thread, gpoint
void
ags_task_thread_append_task(AgsTaskThread *task_thread, AgsTask *task)
{
+ AgsThread *main_loop;
AgsTaskThreadAppend *append;
AgsThread *thread;
+ AgsThreadPool *thread_pool;
+
+ AgsApplicationContext *application_context;
#ifdef AGS_DEBUG
g_message("append task\0");
#endif
+
+ main_loop = ags_thread_get_toplevel(task_thread);
+
+ application_context = ags_main_loop_get_application_context(AGS_MAIN_LOOP(main_loop));
+
+ thread_pool = ags_concurrency_provider_get_thread_pool(AGS_CONCURRENCY_PROVIDER(application_context));
append = (AgsTaskThreadAppend *) malloc(sizeof(AgsTaskThreadAppend));
@@ -368,7 +365,7 @@ ags_task_thread_append_task(AgsTaskThread *task_thread, AgsTask *task)
g_atomic_pointer_set(&(append->data),
task);
- thread = ags_thread_pool_pull(task_thread->thread_pool);
+ thread = ags_thread_pool_pull(thread_pool);
pthread_mutex_lock(&(AGS_RETURNABLE_THREAD(thread)->reset_mutex));
@@ -432,13 +429,23 @@ ags_task_thread_append_tasks_queue(AgsReturnableThread *returnable_thread, gpoin
void
ags_task_thread_append_tasks(AgsTaskThread *task_thread, GList *list)
{
+ AgsThread *main_loop;
AgsTaskThreadAppend *append;
AgsThread *thread;
+ AgsThreadPool *thread_pool;
+
+ AgsApplicationContext *application_context;
#ifdef AGS_DEBUG
g_message("append tasks\0");
#endif
+ main_loop = ags_thread_get_toplevel(task_thread);
+
+ application_context = ags_main_loop_get_application_context(AGS_MAIN_LOOP(main_loop));
+
+ thread_pool = ags_concurrency_provider_get_thread_pool(AGS_CONCURRENCY_PROVIDER(application_context));
+
append = (AgsTaskThreadAppend *) malloc(sizeof(AgsTaskThreadAppend));
g_atomic_pointer_set(&(append->task_thread),
@@ -446,7 +453,7 @@ ags_task_thread_append_tasks(AgsTaskThread *task_thread, GList *list)
g_atomic_pointer_set(&(append->data),
list);
- thread = ags_thread_pool_pull(task_thread->thread_pool);
+ thread = ags_thread_pool_pull(thread_pool);
pthread_mutex_lock(&(AGS_RETURNABLE_THREAD(thread)->reset_mutex));
diff --git a/src/ags/thread/ags_task_thread.h b/src/ags/thread/ags_task_thread.h
index 46e4fe8..42786b9 100644
--- a/src/ags/thread/ags_task_thread.h
+++ b/src/ags/thread/ags_task_thread.h
@@ -62,8 +62,6 @@ struct _AgsTaskThread
volatile GList *exec;
volatile GList *queue;
-
- AgsThreadPool *thread_pool;
};
struct _AgsTaskThreadClass
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list