eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-19 22:30:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1350 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2009-11-15 16:17:30 +00:00
parent 56d83622f0
commit 00147fc3a2
9 changed files with 176 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
veejay-current/veejay-client/configure.ac
View File

@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl AC_INIT dnl AC_INIT
AC_INIT([gveejay],[1.4.8],[veejay-users@lists.sourceforge.net]) AC_INIT([gveejay],[1.5.1],[veejay-users@lists.sourceforge.net])
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_CONFIG_SRCDIR([src/gveejay.c]) AC_CONFIG_SRCDIR([src/gveejay.c])
GVEEJAY_MAJOR_VERSION=1 GVEEJAY_MAJOR_VERSION=1
GVEEJAY_MINOR_VERSION=4 GVEEJAY_MINOR_VERSION=5
GVEEJAY_MICRO_VERSION=8 GVEEJAY_MICRO_VERSION=1
GVEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION GVEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION
GVEEJAY_CODENAME="Reloaded - build $GVEEJAY_MAJOR_VERSION $GVEEJAY_MINOR_VERSION $GVEEJAY_MICRO_VERSION" GVEEJAY_CODENAME="Reloaded - build $GVEEJAY_MAJOR_VERSION $GVEEJAY_MINOR_VERSION $GVEEJAY_MICRO_VERSION"
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

50
veejay-current/veejay-client/share/gveejay.reloaded.glade
View File

@@ -373,7 +373,7 @@
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">False</property> <property name="modal">False</property>
<property name="default_width">600</property> <property name="default_width">600</property>
<property name="default_height">550</property> <property name="default_height">548</property>
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="destroy_with_parent">False</property> <property name="destroy_with_parent">False</property>
<property name="decorated">True</property> <property name="decorated">True</property>
@@ -3443,7 +3443,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3317"> <widget class="GtkImage" id="image3357">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">button_loop.png</property> <property name="pixbuf">button_loop.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3464,7 +3464,7 @@
<signal name="activate" handler="on_sampleadd_clicked" last_modification_time="Tue, 21 Feb 2006 22:53:15 GMT"/> <signal name="activate" handler="on_sampleadd_clicked" last_modification_time="Tue, 21 Feb 2006 22:53:15 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3318"> <widget class="GtkImage" id="image3358">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3484,7 +3484,7 @@
<signal name="activate" handler="on_button_clipcopy_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:58 GMT"/> <signal name="activate" handler="on_button_clipcopy_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:58 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3319"> <widget class="GtkImage" id="image3359">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_copy.png</property> <property name="pixbuf">icon_copy.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3504,7 +3504,7 @@
<signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:35 GMT"/> <signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:35 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3320"> <widget class="GtkImage" id="image3360">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3527,7 +3527,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3321"> <widget class="GtkImage" id="image3361">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_stream.png</property> <property name="pixbuf">icon_stream.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3548,7 +3548,7 @@
<signal name="activate" handler="on_streamnew_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/> <signal name="activate" handler="on_streamnew_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3322"> <widget class="GtkImage" id="image3362">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3568,7 +3568,7 @@
<signal name="activate" handler="on_new_colorstream_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/> <signal name="activate" handler="on_new_colorstream_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3323"> <widget class="GtkImage" id="image3363">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_color.png</property> <property name="pixbuf">icon_color.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3588,7 +3588,7 @@
<signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:28 GMT"/> <signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:28 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3324"> <widget class="GtkImage" id="image3364">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3611,7 +3611,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3325"> <widget class="GtkImage" id="image3365">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_connect.png</property> <property name="pixbuf">icon_connect.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3629,7 +3629,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_learn MIDI</property> <property name="label" translatable="yes">_learn MIDI</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">False</property> <property name="active">True</property>
<signal name="activate" handler="on_midilearn_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:42 GMT"/> <signal name="activate" handler="on_midilearn_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:42 GMT"/>
</widget> </widget>
</child> </child>
@@ -3639,7 +3639,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_MIDI enable</property> <property name="label" translatable="yes">_MIDI enable</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">False</property> <property name="active">True</property>
<property name="group">midilearn</property> <property name="group">midilearn</property>
<signal name="activate" handler="on_midievent_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:29 GMT"/> <signal name="activate" handler="on_midievent_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:29 GMT"/>
</widget> </widget>
@@ -3671,7 +3671,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3326"> <widget class="GtkImage" id="image3366">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_save.png</property> <property name="pixbuf">icon_save.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3692,7 +3692,7 @@
<signal name="activate" handler="on_button_samplelist_save_clicked" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/> <signal name="activate" handler="on_button_samplelist_save_clicked" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3327"> <widget class="GtkImage" id="image3367">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_saveas.png</property> <property name="pixbuf">icon_saveas.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3712,7 +3712,7 @@
<signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/> <signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3328"> <widget class="GtkImage" id="image3368">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3732,7 +3732,7 @@
<signal name="activate" handler="on_save_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/> <signal name="activate" handler="on_save_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3329"> <widget class="GtkImage" id="image3369">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_saveas.png</property> <property name="pixbuf">icon_saveas.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3755,7 +3755,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3330"> <widget class="GtkImage" id="image3370">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3776,7 +3776,7 @@
<signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/> <signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3331"> <widget class="GtkImage" id="image3371">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3796,7 +3796,7 @@
<signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/> <signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3332"> <widget class="GtkImage" id="image3372">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3816,7 +3816,7 @@
<signal name="activate" handler="on_load_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/> <signal name="activate" handler="on_load_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3333"> <widget class="GtkImage" id="image3373">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3874,7 +3874,7 @@
<signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/> <signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3334"> <widget class="GtkImage" id="image3374">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-preferences</property> <property name="stock">gtk-preferences</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@@ -3894,14 +3894,14 @@
</child> </child>
<child> <child>
<widget class="GtkImageMenuItem" id="vims_bundles"> <widget class="GtkImageMenuItem" id="vims_bundles1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">VIMS _Bundles</property> <property name="label" translatable="yes">VIMS _Bundles</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/> <signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3335"> <widget class="GtkImage" id="image3375">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_bundle.png</property> <property name="pixbuf">icon_bundle.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3934,7 +3934,7 @@
<signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/> <signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3336"> <widget class="GtkImage" id="image3376">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_question.png</property> <property name="pixbuf">icon_question.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3954,7 +3954,7 @@
<signal name="activate" handler="on_report_a_bug1_activate" last_modification_time="Sun, 21 Sep 2008 13:31:19 GMT"/> <signal name="activate" handler="on_report_a_bug1_activate" last_modification_time="Sun, 21 Sep 2008 13:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3337"> <widget class="GtkImage" id="image3377">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_bug.png</property> <property name="pixbuf">icon_bug.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>

50
veejay-current/veejay-client/share/gveejay.reloaded.glade.bak
View File

@@ -373,13 +373,13 @@
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">False</property> <property name="modal">False</property>
<property name="default_width">600</property> <property name="default_width">600</property>
<property name="default_height">550</property> <property name="default_height">548</property>
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="destroy_with_parent">False</property> <property name="destroy_with_parent">False</property>
<property name="decorated">True</property> <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property> <property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property> <property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="has_separator">True</property> <property name="has_separator">True</property>
@@ -3443,7 +3443,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3317"> <widget class="GtkImage" id="image3357">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">button_loop.png</property> <property name="pixbuf">button_loop.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3464,7 +3464,7 @@
<signal name="activate" handler="on_sampleadd_clicked" last_modification_time="Tue, 21 Feb 2006 22:53:15 GMT"/> <signal name="activate" handler="on_sampleadd_clicked" last_modification_time="Tue, 21 Feb 2006 22:53:15 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3318"> <widget class="GtkImage" id="image3358">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3484,7 +3484,7 @@
<signal name="activate" handler="on_button_clipcopy_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:58 GMT"/> <signal name="activate" handler="on_button_clipcopy_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:58 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3319"> <widget class="GtkImage" id="image3359">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_copy.png</property> <property name="pixbuf">icon_copy.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3504,7 +3504,7 @@
<signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:35 GMT"/> <signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:35 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3320"> <widget class="GtkImage" id="image3360">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3527,7 +3527,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3321"> <widget class="GtkImage" id="image3361">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_stream.png</property> <property name="pixbuf">icon_stream.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3548,7 +3548,7 @@
<signal name="activate" handler="on_streamnew_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/> <signal name="activate" handler="on_streamnew_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3322"> <widget class="GtkImage" id="image3362">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3568,7 +3568,7 @@
<signal name="activate" handler="on_new_colorstream_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/> <signal name="activate" handler="on_new_colorstream_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:05 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3323"> <widget class="GtkImage" id="image3363">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_color.png</property> <property name="pixbuf">icon_color.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3588,7 +3588,7 @@
<signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:28 GMT"/> <signal name="activate" handler="on_button_sample_del_clicked" last_modification_time="Tue, 21 Feb 2006 22:54:28 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3324"> <widget class="GtkImage" id="image3364">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3611,7 +3611,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3325"> <widget class="GtkImage" id="image3365">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_connect.png</property> <property name="pixbuf">icon_connect.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3629,7 +3629,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_learn MIDI</property> <property name="label" translatable="yes">_learn MIDI</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">False</property> <property name="active">True</property>
<signal name="activate" handler="on_midilearn_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:42 GMT"/> <signal name="activate" handler="on_midilearn_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:42 GMT"/>
</widget> </widget>
</child> </child>
@@ -3639,7 +3639,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_MIDI enable</property> <property name="label" translatable="yes">_MIDI enable</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">False</property> <property name="active">True</property>
<property name="group">midilearn</property> <property name="group">midilearn</property>
<signal name="activate" handler="on_midievent_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:29 GMT"/> <signal name="activate" handler="on_midievent_toggled" last_modification_time="Sat, 07 Apr 2007 17:55:29 GMT"/>
</widget> </widget>
@@ -3671,7 +3671,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3326"> <widget class="GtkImage" id="image3366">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_save.png</property> <property name="pixbuf">icon_save.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3692,7 +3692,7 @@
<signal name="activate" handler="on_button_samplelist_save_clicked" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/> <signal name="activate" handler="on_button_samplelist_save_clicked" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3327"> <widget class="GtkImage" id="image3367">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_saveas.png</property> <property name="pixbuf">icon_saveas.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3712,7 +3712,7 @@
<signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/> <signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3328"> <widget class="GtkImage" id="image3368">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3732,7 +3732,7 @@
<signal name="activate" handler="on_save_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/> <signal name="activate" handler="on_save_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3329"> <widget class="GtkImage" id="image3369">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_saveas.png</property> <property name="pixbuf">icon_saveas.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3755,7 +3755,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3330"> <widget class="GtkImage" id="image3370">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3776,7 +3776,7 @@
<signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/> <signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3331"> <widget class="GtkImage" id="image3371">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3796,7 +3796,7 @@
<signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/> <signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3332"> <widget class="GtkImage" id="image3372">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3816,7 +3816,7 @@
<signal name="activate" handler="on_load_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/> <signal name="activate" handler="on_load_midi_layout1_activate" last_modification_time="Fri, 06 Apr 2007 23:48:49 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3333"> <widget class="GtkImage" id="image3373">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3874,7 +3874,7 @@
<signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/> <signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3334"> <widget class="GtkImage" id="image3374">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-preferences</property> <property name="stock">gtk-preferences</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@@ -3901,7 +3901,7 @@
<signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/> <signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3335"> <widget class="GtkImage" id="image3375">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_bundle.png</property> <property name="pixbuf">icon_bundle.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3934,7 +3934,7 @@
<signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/> <signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3336"> <widget class="GtkImage" id="image3376">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_question.png</property> <property name="pixbuf">icon_question.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -3954,7 +3954,7 @@
<signal name="activate" handler="on_report_a_bug1_activate" last_modification_time="Sun, 21 Sep 2008 13:31:19 GMT"/> <signal name="activate" handler="on_report_a_bug1_activate" last_modification_time="Sun, 21 Sep 2008 13:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image3337"> <widget class="GtkImage" id="image3377">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_bug.png</property> <property name="pixbuf">icon_bug.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>

6
veejay-current/veejay-client/src/callback.c
View File

@@ -1757,11 +1757,8 @@ void on_video_options_apply_clicked (GtkButton *button,
void on_vims_bundles_activate (GtkMenuItem *menuitem, void on_vims_bundles_activate (GtkMenuItem *menuitem,
gpointer user_data) gpointer user_data)
{ {
if(!info->status_lock)
{
GtkWidget *vims_bundles_window = glade_xml_get_widget(info->main_window, "vims_bundles"); GtkWidget *vims_bundles_window = glade_xml_get_widget(info->main_window, "vims_bundles");
gtk_widget_show(vims_bundles_window); gtk_widget_show(vims_bundles_window);
}
} }
@@ -1771,11 +1768,8 @@ void on_vims_bundles_activate (GtkMenuItem *menuitem,
void on_vims_bundles_close (GtkDialog *dialog, void on_vims_bundles_close (GtkDialog *dialog,
gpointer user_data) gpointer user_data)
{ {
if(!info->status_lock)
{
GtkWidget *vims_bundles_window = glade_xml_get_widget(info->main_window, "vims_bundles"); GtkWidget *vims_bundles_window = glade_xml_get_widget(info->main_window, "vims_bundles");
gtk_widget_hide(vims_bundles_window); gtk_widget_hide(vims_bundles_window);
}
} }
/* Menu entries */ /* Menu entries */

5
veejay-current/veejay-client/src/gveejay.c
View File

@@ -235,6 +235,9 @@ int main(int argc, char *argv[]) {
default_bank_values( &col, &row ); default_bank_values( &col, &row );
gui_load_theme(); gui_load_theme();
register_signals();
vj_gui_init( skins[selected_skin].file, launcher, hostname, port_num, use_threads ); vj_gui_init( skins[selected_skin].file, launcher, hostname, port_num, use_threads );
vj_gui_style_setup(); vj_gui_style_setup();
@@ -244,6 +247,8 @@ int main(int argc, char *argv[]) {
veejay_msg(VEEJAY_MSG_INFO, "Starting with preview enabled"); veejay_msg(VEEJAY_MSG_INFO, "Starting with preview enabled");
gveejay_preview(preview); gveejay_preview(preview);
} }
if( launcher ) if( launcher )
{ {
reloaded_launcher( hostname, port_num ); reloaded_launcher( hostname, port_num );

2
veejay-current/veejay-client/src/multitrack.c
View File

@@ -935,7 +935,7 @@ int multrack_audoadd( void *data, char *hostname, int port_num )
} }
// mt->master_track = track; // mt->master_track = track;
// gvr_set_master( mt->preview, track ); gvr_set_master( mt->preview, track );
gtk_widget_set_sensitive_(GTK_WIDGET(mt->view[track]->panel), TRUE ); gtk_widget_set_sensitive_(GTK_WIDGET(mt->view[track]->panel), TRUE );

21
veejay-current/veejay-client/src/sequence.c
View File

@@ -40,7 +40,7 @@ extern void reloaded_schedule_restart();
typedef struct typedef struct
{ {
uint8_t *image_data[16]; uint8_t *image_data[16];
uint8_t *status_tokens[16]; int *status_tokens[16];
int widths[16]; int widths[16];
int heights[16]; int heights[16];
int active_list[16]; int active_list[16];
@@ -339,16 +339,23 @@ static int veejay_process_status( veejay_preview_t *vp, veejay_track_t *v )
} }
else else
{ {
int err = 0;
while( ( n = vj_client_poll( v->fd, V_STATUS ))) while( ( n = vj_client_poll( v->fd, V_STATUS )))
{ {
char trashcan[100]; char trashcan[100];
int k = vj_client_read( v->fd, V_STATUS, trashcan,sizeof(trashcan)); int k = vj_client_read( v->fd, V_STATUS, trashcan,sizeof(trashcan));
if( k == -1 && v->is_master ) #ifdef STRICT_CHECKING
reloaded_schedule_restart(); veejay_msg(VEEJAY_MSG_DEBUG, "Flushing %d bytes '%s'",k,trashcan);
if( k <= 0 ) #endif
break; if( k <= 0 && v->is_master)
err = -1;
} }
if( n == -1 && v->is_master )
if( n <= 0 && v->is_master )
err = -1;
if( err == -1)
reloaded_schedule_restart(); reloaded_schedule_restart();
} }
return 1; return 1;
@@ -979,10 +986,10 @@ static int gvr_veejay( veejay_preview_t *vp , veejay_track_t *v, int track_num
if(v->status_buffer) free(v->status_buffer); if(v->status_buffer) free(v->status_buffer);
if(v->data_buffer) free(v->data_buffer); if(v->data_buffer) free(v->data_buffer);
if(v->tmp_buffer) free(v->tmp_buffer); if(v->tmp_buffer) free(v->tmp_buffer);
free(v);
vp->tracks[track_num] = NULL; vp->tracks[track_num] = NULL;
if( v->is_master ) if( v->is_master )
reloaded_schedule_restart(); reloaded_schedule_restart();
free(v);
} }
else else
{ {

149
veejay-current/veejay-client/src/vj-api.c
View File

@@ -771,7 +771,7 @@ static struct
{"scrolledwindow49"}, // srt stuff {"scrolledwindow49"}, // srt stuff
{"samplegrid_frame"}, {"samplegrid_frame"},
{"markerframe"}, {"markerframe"},
{"NULL"} {NULL}
}; };
static struct static struct
@@ -785,7 +785,7 @@ static struct
{"fxpanel"}, {"fxpanel"},
{"panels"}, {"panels"},
{"scrolledwindow49"}, // srt stuff {"scrolledwindow49"}, // srt stuff
{"NULL"}, {NULL},
}; };
enum enum
@@ -1957,7 +1957,11 @@ int gveejay_new_slot(int mode)
int id = 0; int id = 0;
int result_len = 0; int result_len = 0;
gchar *result = recv_vims( 3, &result_len ); gchar *result = recv_vims( 3, &result_len );
#ifdef STRICT_CHECKING
//@ err
assert( result_len >= 0 );
assert( result != NULL );
#endif
if(result_len <= 0 ) if(result_len <= 0 )
{ {
veejay_msg(0, "No reply from veejay-server, but expected new sample/slot identifier"); veejay_msg(0, "No reply from veejay-server, but expected new sample/slot identifier");
@@ -1970,35 +1974,10 @@ int gveejay_new_slot(int mode)
if( id <= 0 ) if( id <= 0 )
{ {
veejay_msg(0, "Error creating new sample slot");
// gveejay_error_slot( mode ); // gveejay_error_slot( mode );
return 0; return 0;
} }
else
{
vj_msg(VEEJAY_MSG_INFO, "Created new %s %d", (mode == MODE_SAMPLE ? "Sample" : "Stream"), id);
int poke_slot = 0;
int bank_page = 0;
if(verify_bank_capacity( &bank_page, &poke_slot, id, mode ))
{
info->uc.reload_hint[HINT_SLIST] = 1;
/* sample_slot_t *tmp_slot = vj_gui_get_sample_info(id, mode );
if(tmp_slot)
{
tmp_slot->slot_number = poke_slot;
add_sample_to_sample_banks( bank_page, tmp_slot );
free_slot( tmp_slot );
info->uc.expected_slots ++;
return id;
}*/
}
else
{
message_dialog( "Error", "Samplebank is full");
return 0;
}
}
return id; return id;
} }
@@ -3814,8 +3793,10 @@ int verify_bank_capacity(int *bank_page_, int *slot_, int sample_id, int sample_
int poke_slot = 0; int poke_slot = 0;
int bank_page = find_bank_by_sample( sample_id, sample_type, &poke_slot ); int bank_page = find_bank_by_sample( sample_id, sample_type, &poke_slot );
if(bank_page == -1) if(bank_page == -1) {
veejay_msg(0, "No slot found for (%d,%d)",sample_id,sample_type);
return 0; return 0;
}
if( !bank_exists(bank_page, poke_slot)) if( !bank_exists(bank_page, poke_slot))
add_bank( bank_page ); add_bank( bank_page );
@@ -3823,6 +3804,16 @@ int verify_bank_capacity(int *bank_page_, int *slot_, int sample_id, int sample_
*bank_page_ = bank_page; *bank_page_ = bank_page;
*slot_ = poke_slot; *slot_ = poke_slot;
#ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "(type=%d,id=%d) needs new slot, suggesting page %d, slot %d",
sample_type, sample_id, bank_page, poke_slot );
// if( info->sample_banks[bank_page] )
// assert( info->sample_banks[bank_page]->slot[poke_slot]->sample_id <= 0 );
#endif
return 1; return 1;
} }
@@ -3935,12 +3926,11 @@ static void select_slot__( int pm )
/* falsify activation */ /* falsify activation */
if(info->status_tokens[CURRENT_ID] > 0) if(info->status_tokens[CURRENT_ID] > 0)
{ {
if(verify_bank_capacity( &b, &p, info->status_tokens[CURRENT_ID], if(verify_bank_capacity( &b, &p, info->status_tokens[CURRENT_ID],pm ))
info->status_tokens[PLAY_MODE] ))
{ {
if( info->selected_slot ) { if( info->selected_slot ) {
if ( info->selected_slot->sample_type != pm || info->selected_slot->sample_id != if ( info->selected_slot->sample_type != pm || info->selected_slot->sample_id !=
info->status_tokens[CURRENT_ID] ) { info->selected_slot->sample_id ) {
set_activation_of_slot_in_samplebank(FALSE); set_activation_of_slot_in_samplebank(FALSE);
} }
} }
@@ -4018,8 +4008,9 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
int n_slots = 0; int n_slots = 0;
reset_tree( "tree_sources" ); reset_tree( "tree_sources" );
if( with_reset_slotselection ) if( with_reset_slotselection ) {
reset_samplebank(); reset_samplebank();
}
multi_vims( VIMS_SAMPLE_LIST,"%d", 0 ); multi_vims( VIMS_SAMPLE_LIST,"%d", 0 );
gint fxlen = 0; gint fxlen = 0;
@@ -4061,6 +4052,7 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
gchar *timecode = format_selection_time( 0,(values[2]-values[1]) ); gchar *timecode = format_selection_time( 0,(values[2]-values[1]) );
int int_id = values[0]; int int_id = values[0];
int poke_slot= 0; int bank_page = 0; int poke_slot= 0; int bank_page = 0;
verify_bank_capacity( &bank_page , &poke_slot, int_id, 0); verify_bank_capacity( &bank_page , &poke_slot, int_id, 0);
if(bank_page >= 0 ) if(bank_page >= 0 )
{ {
@@ -4137,7 +4129,11 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
gchar *gsource = _utf8str( descr ); gchar *gsource = _utf8str( descr );
gchar *gtype = _utf8str( source ); gchar *gtype = _utf8str( source );
int bank_page = 0; int poke_slot = 0; int bank_page = 0;
int poke_slot = 0;
verify_bank_capacity( &bank_page , &poke_slot, values[0], 1);
if(bank_page >= 0) if(bank_page >= 0)
{ {
if( info->sample_banks[bank_page]->slot[poke_slot] <= 0 ) if( info->sample_banks[bank_page]->slot[poke_slot] <= 0 )
@@ -5315,6 +5311,8 @@ void find_user_themes(int theme)
(*dst)++; (*dst)++;
} }
} }
if( sloppy )
close( sloppy ); close( sloppy );
if( strcmp( location, "Default" ) == 0 ) if( strcmp( location, "Default" ) == 0 )
@@ -6381,33 +6379,32 @@ static void theme_response( gchar *string )
static void reloaded_sighandler(int x) static void reloaded_sighandler(int x)
{ {
veejay_msg(VEEJAY_MSG_WARNING, "Caught signal %x", x); veejay_msg(VEEJAY_MSG_WARNING, "Caught signal %x", x);
switch( x ) {
case SIGINT: if( x == SIGPIPE ) {
//@ quit dialog;
break;
case SIGQUIT:
case SIGTERM:
case SIGKILL:
case SIGSEGV:
break;
case SIGPIPE:
reloaded_schedule_restart(); reloaded_schedule_restart();
break;
} }
else if ( x == SIGINT || x == SIGABRT ) {
veejay_msg(VEEJAY_MSG_WARNING, "Stopping reloaded"); veejay_msg(VEEJAY_MSG_WARNING, "Stopping reloaded");
exit(0); exit(0);
} else if ( x == SIGSEGV ) {
veejay_msg(VEEJAY_MSG_ERROR, "Bugs compromised the system.");
exit(0);
}
} }
void register_signals() void register_signals()
{ {
signal( SIGTERM, reloaded_sighandler );
signal( SIGINT, reloaded_sighandler ); signal( SIGINT, reloaded_sighandler );
signal( SIGHUP , reloaded_sighandler );
signal( SIGPIPE, reloaded_sighandler ); signal( SIGPIPE, reloaded_sighandler );
signal( SIGQUIT, reloaded_sighandler ); signal( SIGQUIT, reloaded_sighandler );
signal( SIGSEGV, reloaded_sighandler ); signal( SIGSEGV, reloaded_sighandler );
signal( SIGABRT, reloaded_sighandler );
signal( SIGSEGV, reloaded_sighandler );
} }
void vj_gui_wipe() void vj_gui_wipe()
{ {
int i; int i;
@@ -7231,10 +7228,11 @@ void reset_samplebank(void)
{ {
if(info->sample_banks[i]) if(info->sample_banks[i])
{ {
/* free memory in use */ /* clear memory in use */
for(j = 0; j < NUM_SAMPLES_PER_PAGE ; j ++ ) for(j = 0; j < NUM_SAMPLES_PER_PAGE ; j ++ )
{ {
sample_slot_t *slot = info->sample_banks[i]->slot[j]; sample_slot_t *slot = info->sample_banks[i]->slot[j];
if(slot->sample_id) if(slot->sample_id)
{ {
if(slot->title) free(slot->title); if(slot->title) free(slot->title);
@@ -7366,45 +7364,50 @@ static sample_gui_slot_t *find_gui_slot_by_sample( int sample_id , int sample_ty
static int find_bank_by_sample(int sample_id, int sample_type, int *slot ) static int find_bank_by_sample(int sample_id, int sample_type, int *slot )
{ {
int i; int i,j;
/* See if ID is somewhere in the samplebank */
for( i = 0; i < NUM_BANKS; i ++ ) for( i = 0; i < NUM_BANKS; i ++ )
{ {
int j; if(!info->sample_banks[i]) {
if(info->sample_banks[i]) continue;
}
for( j = 0; j < NUM_SAMPLES_PER_PAGE; j ++ ) for( j = 0; j < NUM_SAMPLES_PER_PAGE; j ++ )
{ {
if(info->sample_banks[i]->slot[j]->sample_id == sample_id && if(info->sample_banks[i]->slot[j]->sample_id == sample_id &&
info->sample_banks[i]->slot[j]->sample_type == sample_type ) info->sample_banks[i]->slot[j]->sample_type == sample_type)
{ {
*slot = j; *slot = j;
#ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "using existing slot (%d,%d)",
sample_id,sample_type );
#endif
return i; return i;
} }
} }
} }
/* Fall back to suggest a bank number to add the new id */
for( i = 0; i < NUM_BANKS; i ++ ) for( i = 0; i < NUM_BANKS; i ++ )
{ {
if(!info->sample_banks[i]) /* First slot in bank */ if(!info->sample_banks[i]) {
{
*slot = 0; *slot = 0;
return i; return i;
} }
else
{
int j; /* Scan for available slots in this bank page */
for( j = 0; j < NUM_SAMPLES_PER_PAGE; j ++ ) for( j = 0; j < NUM_SAMPLES_PER_PAGE; j ++ )
{ {
if( info->sample_banks[i]->slot[j]->sample_id <= 0 ) if ( info->sample_banks[i]->slot[j]->sample_id <= 0)
{ {
*slot = j; *slot = j;
#ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "using new slot (%d,%d)",
sample_id,sample_type);
#endif
return i; return i;
} }
} }
} }
}
*slot = -1; *slot = -1;
return -1; return -1;
} }
@@ -7848,10 +7851,20 @@ static void set_selection_of_slot_in_samplebank(gboolean active)
static int add_sample_to_sample_banks(int bank_page,sample_slot_t *slot) static int add_sample_to_sample_banks(int bank_page,sample_slot_t *slot)
{ {
int bp = 0; int s = 0; int bp = 0; int s = 0;
#ifdef STRICT_CHECKING
if(verify_bank_capacity( &bp, &s, slot->sample_id, slot->sample_type )) int result = verify_bank_capacity( &bp, &s, slot->sample_id, slot->sample_type );
veejay_msg(VEEJAY_MSG_DEBUG, "add slot on page %d: type=%d id=%d. result=%d", bank_page,slot->sample_type,slot->sample_id,result );
if( result )
update_sample_slot_data( bp, s, slot->sample_id,slot->sample_type,slot->title,slot->timecode); update_sample_slot_data( bp, s, slot->sample_id,slot->sample_type,slot->title,slot->timecode);
#else
if(verify_bank_capacity( &bp, &s, slot->sample_id, slot->sample_type ))
update_sample_slot_data( bp, s, slot->sample_id,slot->sample_type,slot->title,slot->timecode);
#endif
return 1; return 1;
} }
@@ -7936,6 +7949,16 @@ static void update_sample_slot_data(int page_num, int slot_num, int sample_id, g
sample_slot_t *slot = info->sample_banks[page_num]->slot[slot_num]; sample_slot_t *slot = info->sample_banks[page_num]->slot[slot_num];
sample_gui_slot_t *gui_slot = info->sample_banks[page_num]->gui_slot[slot_num]; sample_gui_slot_t *gui_slot = info->sample_banks[page_num]->gui_slot[slot_num];
#ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "update slot %d on page %d with (type=%d,id=%d)",
slot_num, page_num, sample_type, sample_id );
veejay_msg(VEEJAY_MSG_DEBUG, "(#%d,type=%d,%s,%s) change to (#%d,type=%d,%s,%s)",
slot->sample_id,slot->sample_type,slot->timecode,slot->title,
sample_id,sample_type,timecode,title );
#endif
if(slot->timecode) free(slot->timecode); if(slot->timecode) free(slot->timecode);
if(slot->title) free(slot->title); if(slot->title) free(slot->title);

2
veejay-current/veejay-client/src/vj-midi.c
View File

@@ -482,7 +482,7 @@ int vj_midi_handle_events(void *vv)
{ {
vmidi_t *v = (vmidi_t*) vv; vmidi_t *v = (vmidi_t*) vv;
if(!v->active) return 0; if(!v->active) return 0;
if( poll( v->pfd, v->npfd, 0 ) > 0 ) if( poll( v->pfd, v->npfd, 5 ) > 0 )
{ {
vj_midi_action( v ); vj_midi_action( v );
return 1; return 1;