diff --git a/veejay-current/veejay-client/configure.ac b/veejay-current/veejay-client/configure.ac index fc5e65a5..f0660b3a 100644 --- a/veejay-current/veejay-client/configure.ac +++ b/veejay-current/veejay-client/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_SRCDIR([src/gveejay.c]) VEEJAY_MAJOR_VERSION=1 VEEJAY_MINOR_VERSION=4 -VEEJAY_MICRO_VERSION=4 +VEEJAY_MICRO_VERSION=5 VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION VEEJAY_CODENAME="Reloaded - build $VEEJAY_MAJOR_VERSION $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" AC_CONFIG_HEADERS([config.h]) diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index 942ecdb2..f8b4d268 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -3668,66 +3668,140 @@ 0 - + True False 0 - + True - True - Play and repeat sample grid - True - GTK_RELIEF_NORMAL - True - False - False - True - + False + 0 + + + + True + True + Play and repeat sample grid + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + 0 - False - False + True + True - + True - Play and record this sequence to a new sample - True - GTK_RELIEF_NORMAL - True - + 0 + 0.5 + GTK_SHADOW_NONE - + True 0.5 0.5 - 0 - 0 + 1 + 1 0 0 - 0 + 12 0 - + True False - 2 + 0 - + True - icon_record.png - 0.5 - 0.5 - 0 - 0 + Play and record this sequence to a new sample + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_record.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 0 @@ -3737,22 +3811,24 @@ - + True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Stop recording from this sequence + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_recordstop.png + 0.5 + 0.5 + 0 + 0 + + 0 @@ -3760,57 +3836,67 @@ False + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 30 + 0 + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + PANGO_ELLIPSIZE_NONE + + + + + 0 + True + True + + - - - 0 - False - False - - - - - - True - Stop recording from this sequence - True - GTK_RELIEF_NORMAL - True - - + True - icon_recordstop.png + <b>SEQ record to new sample</b> + False + True + GTK_JUSTIFY_LEFT + False + False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + label_item + 0 - False - False - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False + True + True @@ -10438,237 +10524,217 @@ MLZO - + True False 0 - - True - True - 0 - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_fbw.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_reverse.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_pause.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_play.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_ffw.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - 0 - False - False - - - - - + True 0 0.5 GTK_SHADOW_NONE - + True 0.5 0.5 1 1 - 0 + 4 0 - 12 + 4 0 - - 80 + True - True - True - GTK_POS_RIGHT - 0 - GTK_UPDATE_CONTINUOUS - False - 0 0 0 0 0 0 - + True + 0 + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_fbw.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_reverse.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_pause.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_play.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_ffw.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + @@ -10682,27 +10748,215 @@ MLZO - + True - True + False 0 - + True - True - GTK_RELIEF_HALF - True - + 0 + 0.5 + GTK_SHADOW_NONE - + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 80 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 80 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 1 0 13 0 0 0 + + + + + + 0 + True + True + + + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True - button_prev.png 0.5 0.5 - 0 - 0 + 1 + 1 + 4 + 0 + 0 + 0 + + + + True + True + 0 + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_prev.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_skip.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + Mark current position as start of a new sample + True + [... + True + GTK_RELIEF_HALF + True + + + + 0 + True + True + + + + + + True + Mark current position as sample end and create new sample + True + ...] + True + GTK_RELIEF_HALF + True + + + + 0 + True + True + + + + @@ -10714,319 +10968,271 @@ MLZO - + True - True - GTK_RELIEF_HALF - True - + 0 + 0.5 + GTK_SHADOW_NONE - + True - button_skip.png - 0.5 - 0.5 - 0 - 0 + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 4 + 0 + 0 + 0 + + + + True + Play once + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_looponce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + False + + + + + + True + Normal Loop + True + GTK_RELIEF_HALF + True + True + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_loop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Pingpong loop + True + GTK_RELIEF_HALF + True + False + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_bounce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Random Frame + True + GTK_RELIEF_HALF + True + False + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_rand.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + 0 - True + False True - - - - True - Mark current position as start of a new sample - True - [... - True - GTK_RELIEF_HALF - True - - - - 0 - True - True - - - - - - True - Mark current position as sample end and create new sample - True - ...] - True - GTK_RELIEF_HALF - True - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - Play once - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_looponce.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Normal Loop - True - GTK_RELIEF_HALF - True - True - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_loop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Pingpong loop - True - GTK_RELIEF_HALF - True - False - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_bounce.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Random Frame - True - GTK_RELIEF_HALF - True - False - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_rand.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - 0 diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak index 7615d5e7..d5064cf0 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak @@ -1139,91 +1139,75 @@ 0 - + True - 0.5 - 0.5 - 1 - 1 - 3 - 20 - 0 - 0 + False + 0 - + True - False - 0 - - - - True - Enable or disable selected FX - True - - True - GTK_RELIEF_HALF - True - True - False - True - - - - 0 - False - False - - - - - - - - - - 36 - True - Change currently selected FX chain entry - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 19 1 10 10 - - - - 0 - False - True - - - - - - True - Displays FX on currently selected chain entry - True - True - True - 0 - - True - * - False - 15 - - - 0 - True - True - - + Enable or disable selected FX + True + + True + GTK_RELIEF_HALF + True + True + False + True + + + 0 + False + False + + + + + + + + + + 36 + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 19 1 10 10 + + + + 0 + False + True + + + + + + True + True + True + True + 0 + + True + * + False + 15 + + + 0 + True + True + @@ -2429,7 +2413,6 @@ True - FX with at most one input sources True Mixing effects True @@ -2450,7 +2433,6 @@ True - FX without any input sources True Image effects True @@ -2967,7 +2949,7 @@ 0 - False + True True @@ -2995,7 +2977,7 @@ 0 - False + True True @@ -3022,7 +3004,7 @@ 0 - False + True True @@ -3398,7 +3380,7 @@ True - Start at + startframe False False GTK_JUSTIFY_LEFT @@ -3448,7 +3430,7 @@ True - Stop at + endframe False False GTK_JUSTIFY_LEFT @@ -3585,7 +3567,7 @@ True - <b>Timeline</b> + <b>timeline</b> False True GTK_JUSTIFY_LEFT @@ -3686,66 +3668,140 @@ 0 - + True False 0 - + True - True - Play and repeat sample grid - True - GTK_RELIEF_NORMAL - True - False - False - True - + False + 0 + + + + True + True + Play and repeat sample grid + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + 0 - False - False + True + True - + True - Play and record this sequence to a new sample - True - GTK_RELIEF_NORMAL - True - + 0 + 0.5 + GTK_SHADOW_NONE - + True 0.5 0.5 - 0 - 0 + 1 + 1 0 0 - 0 + 12 0 - + True False - 2 + 0 - + True - icon_record.png - 0.5 - 0.5 - 0 - 0 + Play and record this sequence to a new sample + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_record.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 0 @@ -3755,22 +3811,24 @@ - + True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Stop recording from this sequence + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_recordstop.png + 0.5 + 0.5 + 0 + 0 + + 0 @@ -3778,57 +3836,67 @@ False + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 30 + 0 + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + PANGO_ELLIPSIZE_NONE + + + + + 0 + True + True + + - - - 0 - False - False - - - - - - True - Stop recording from this sequence - True - GTK_RELIEF_NORMAL - True - - + True - icon_recordstop.png + <b>SEQ record to new sample</b> + False + True + GTK_JUSTIFY_LEFT + False + False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + label_item + 0 - False - False - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False + True + True @@ -10456,237 +10524,217 @@ MLZO - + True False 0 - - True - True - 0 - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_fbw.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_reverse.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_pause.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_play.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_ffw.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_HALF - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - 0 - False - False - - - - - + True 0 0.5 GTK_SHADOW_NONE - + True 0.5 0.5 1 1 - 0 + 4 0 - 12 + 4 0 - - 80 + True - True - True - GTK_POS_RIGHT - 0 - GTK_UPDATE_CONTINUOUS - False - 0 0 0 0 0 0 - + True + 0 + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_fbw.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_reverse.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_pause.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_play.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_ffw.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + @@ -10700,27 +10748,215 @@ MLZO - + True - True + False 0 - + True - True - GTK_RELIEF_HALF - True - + 0 + 0.5 + GTK_SHADOW_NONE - + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 80 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 80 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 1 0 13 1 0 0 + + + + + + 0 + True + True + + + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True - button_prev.png 0.5 0.5 - 0 - 0 + 1 + 1 + 4 + 0 + 0 + 0 + + + + True + True + 0 + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_prev.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_HALF + True + + + + + True + button_skip.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + Mark current position as start of a new sample + True + [... + True + GTK_RELIEF_HALF + True + + + + 0 + True + True + + + + + + True + Mark current position as sample end and create new sample + True + ...] + True + GTK_RELIEF_HALF + True + + + + 0 + True + True + + + + @@ -10732,319 +10968,271 @@ MLZO - + True - True - GTK_RELIEF_HALF - True - + 0 + 0.5 + GTK_SHADOW_NONE - + True - button_skip.png - 0.5 - 0.5 - 0 - 0 + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 4 + 0 + 0 + 0 + + + + True + Play once + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_looponce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + False + + + + + + True + Normal Loop + True + GTK_RELIEF_HALF + True + True + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_loop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Pingpong loop + True + GTK_RELIEF_HALF + True + False + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_bounce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Random Frame + True + GTK_RELIEF_HALF + True + False + False + True + loop_none + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + button_rand.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + 0 - True + False True - - - - True - Mark current position as start of a new sample - True - [... - True - GTK_RELIEF_HALF - True - - - - 0 - True - True - - - - - - True - Mark current position as sample end and create new sample - True - ...] - True - GTK_RELIEF_HALF - True - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - Play once - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_looponce.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Normal Loop - True - GTK_RELIEF_HALF - True - True - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_loop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Pingpong loop - True - GTK_RELIEF_HALF - True - False - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_bounce.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Random Frame - True - GTK_RELIEF_HALF - True - False - False - True - loop_none - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_rand.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - 0 @@ -11119,7 +11307,6 @@ MLZO True - Goto previous bank True << True @@ -11162,7 +11349,6 @@ MLZO True - Changes current sample bank page True 1 0 @@ -11183,7 +11369,6 @@ MLZO True - Goto next bank True >> True @@ -12504,7 +12689,6 @@ MLZO 24 24 True - Decrement framerate True GTK_RELIEF_HALF True @@ -12532,7 +12716,7 @@ MLZO 24 24 - Increment framerate + True True GTK_RELIEF_HALF True diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index 19f94bb4..9d412e9f 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -785,6 +785,19 @@ void on_spin_sampleend_value_changed( GtkWidget *widget, gpointer user_data) } } +void on_slow_slider_value_changed( GtkWidget *widget, gpointer user_data ) +{ + if(!info->status_lock) { + gint value = (gint) get_slider_val("slow_slider"); + multi_vims(VIMS_VIDEO_SET_SLOW, "%d", value ); + value ++; + vj_msg(VEEJAY_MSG_INFO, "Slow video to %2.2f fps", + info->el.fps / (float) value ); + vj_midi_learning_vims_simple(info->midi, "slow_slider",VIMS_VIDEO_SET_SLOW); + } +} + + void on_speed_slider_value_changed(GtkWidget *widget, gpointer user_data) { if(!info->status_lock) diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 40fe88f7..e4e7dd1a 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -700,6 +700,7 @@ static struct {"button_samplestart"}, {"button_sampleend"}, {"speed_slider"}, + {"slow_slider"}, {"vjframerate"}, {"markerframe"}, {NULL} @@ -715,6 +716,7 @@ static struct {"button_083"}, {"video_navigation_buttons"}, {"speed_slider"}, + {"slow_slider"}, {"button_200"}, // mask button {"frame_fxtree"}, {"frame_fxtree3"}, @@ -1565,7 +1567,7 @@ void about_dialog() GtkWidget *about = g_object_new( GTK_TYPE_ABOUT_DIALOG, "program_name", "reloaded", - "name", "Reloaded", + "name", VEEJAY_CODENAME, "version", VERSION, "copyright", "(C) 2004 - 2008 N. Elburg et all.", "comments", "The graphical interface for Veejay", @@ -2868,6 +2870,7 @@ static void update_current_slot(int *history, int pm, int last_pm) if( history[FRAME_DUP] != info->status_tokens[FRAME_DUP] ) { update_spin_value( "spin_framedelay", info->status_tokens[FRAME_DUP]); + update_slider_value("slow_slider", info->status_tokens[FRAME_DUP],0); } @@ -6290,26 +6293,38 @@ gboolean slider_scroll_event( GtkWidget *widget, GdkEventScroll *ev, gpointer us } else if (ev->direction == GDK_SCROLL_DOWN ) { param_changed( i, -1, slider_names_[i].text ); } - veejay_msg(0, "%s: %d,%d",__FUNCTION__,ev->direction,i); return FALSE; } gboolean speed_scroll_event( GtkWidget *widget, GdkEventScroll *ev, gpointer user_data) { - gint i = GPOINTER_TO_INT(user_data); int plainspeed = info->status_tokens[SAMPLE_SPEED]; - if(ev->direction == GDK_SCROLL_UP ) { plainspeed = plainspeed + 1; } else if (ev->direction == GDK_SCROLL_DOWN ) { plainspeed = plainspeed - 1; } update_slider_value( "speed_slider", plainspeed, 0 ); - - veejay_msg(0, "%s: %d,%d",__FUNCTION__,ev->direction,i); return FALSE; } +gboolean slow_scroll_event( GtkWidget *widget, GdkEventScroll *ev, gpointer user_data) +{ + int plainspeed = get_slider_val("slow_slider"); + if(ev->direction == GDK_SCROLL_DOWN ) { + plainspeed = plainspeed - 1; + } else if (ev->direction == GDK_SCROLL_UP ) { + plainspeed = plainspeed + 1; + } + if(plainspeed < 0 ) + plainspeed = 0; + update_slider_value("slow_slider",plainspeed,0); + + plainspeed ++; + vj_msg(VEEJAY_MSG_INFO, "Slow video to %2.2f fps", + info->el.fps / (float) plainspeed ); + return FALSE; +} void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num, int use_threads) { @@ -6409,6 +6424,9 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num, g_signal_connect( GTK_OBJECT( glade_xml_get_widget(info->main_window, "speed_slider") ), "scroll-event", G_CALLBACK(speed_scroll_event), NULL ); + g_signal_connect( GTK_OBJECT( glade_xml_get_widget(info->main_window, "slow_slider") ), "scroll-event", + G_CALLBACK(slow_scroll_event), NULL ); + veejay_memset( vj_event_list, 0, sizeof( vj_event_list )); veejay_memset( vims_keys_list, 0, sizeof( vims_keys_list) ); @@ -6628,6 +6646,7 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num) update_spin_range( "spin_framedelay", 1, 13, 0); update_slider_range( "speed_slider", -13,13,speed,0); + update_slider_range( "slow_slider",0,13,0,0); update_label_str( "label_hostnamex", (hostname == NULL ? group_name: hostname ) ); update_label_i( "label_portx",port_num,0);