diff --git a/veejay-current/veejay-client/share/button_back.png b/veejay-current/veejay-client/share/button_back.png new file mode 100644 index 00000000..c2295b5b Binary files /dev/null and b/veejay-current/veejay-client/share/button_back.png differ diff --git a/veejay-current/veejay-client/share/button_next.png b/veejay-current/veejay-client/share/button_next.png new file mode 100644 index 00000000..d5902fb0 Binary files /dev/null and b/veejay-current/veejay-client/share/button_next.png differ diff --git a/veejay-current/veejay-client/share/button_rand.png b/veejay-current/veejay-client/share/button_rand.png index 3cc6916f..f2dd61cc 100644 Binary files a/veejay-current/veejay-client/share/button_rand.png and b/veejay-current/veejay-client/share/button_rand.png differ diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index f8b4d268..da1e4b39 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -54,7 +54,7 @@ True - + True button_loop.png 0.5 @@ -75,7 +75,7 @@ - + True icon_openlist.png 0.5 @@ -95,7 +95,7 @@ - + True icon_copy.png 0.5 @@ -115,7 +115,7 @@ - + True icon_clear.png 0.5 @@ -138,7 +138,7 @@ True - + True icon_stream.png 0.5 @@ -159,7 +159,7 @@ - + True icon_openlist.png 0.5 @@ -179,7 +179,7 @@ - + True icon_color.png 0.5 @@ -199,7 +199,7 @@ - + True icon_clear.png 0.5 @@ -222,7 +222,7 @@ True - + True icon_connect.png 0.5 @@ -267,7 +267,7 @@ True - + True icon_save.png 0.5 @@ -288,7 +288,7 @@ - + True icon_saveas.png 0.5 @@ -308,7 +308,7 @@ - + True icon_openlist.png 0.5 @@ -328,7 +328,7 @@ - + True icon_saveas.png 0.5 @@ -351,7 +351,7 @@ True - + True icon_open.png 0.5 @@ -372,7 +372,7 @@ - + True icon_open.png 0.5 @@ -392,7 +392,7 @@ - + True icon_openlist.png 0.5 @@ -412,7 +412,7 @@ - + True icon_open.png 0.5 @@ -470,7 +470,7 @@ - + True gtk-preferences 1 @@ -483,27 +483,6 @@ - - - True - VIMS Console - True - - - - - True - gtk-dialog-info - 1 - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -518,7 +497,7 @@ - + True icon_bundle.png 0.5 @@ -551,7 +530,7 @@ - + True icon_question.png 0.5 @@ -571,7 +550,7 @@ - + True icon_bug.png 0.5 @@ -644,451 +623,6 @@ False - - - - True - False - 0 - - - - True - True - preview on/off - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - - - - - True - True - gray - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Very low quality preview - True - 1/8 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - Low quality preview - True - 1/4 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - Medium quality preview - True - 1/2 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - High quality preview - True - 1/1 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 3 - False - True - - - - - 0 - False - True - - - - - - True - False - 0 - - - - localhost:3490 - True - GTK_RELIEF_HALF - True - - - - - True - icon_connect.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - Disconnect - True - GTK_RELIEF_HALF - True - - - - - True - icon_disconnect.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Toggle Bezerk Mode - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_berserk.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Display Debug - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_bug.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Change Playback Mode - True - GTK_RELIEF_HALF - True - - - - - True - icon_playmode.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Take Background Mask(diff overlay) - True - GTK_RELIEF_HALF - True - - - - - True - icon_mask.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Enable jack - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_jack.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Take Screenshot - True - GTK_RELIEF_HALF - True - - - - - True - icon_screenshot.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Display OSD status - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_osd.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - Enable/Disable EDL Cache (see veejay console) - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_cache.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Drop audio/video frames and keep in sync (by default enabled) - True - Sync - True - GTK_RELIEF_NORMAL - True - True - False - - - - 0 - False - False - - - - - 0 - False - False - - 0 @@ -10135,6 +9669,769 @@ MLZO False 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 150 + 0 + + + + True + False + 0 + + + + True + True + preview on/off + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + True + gray + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + Very low quality preview + True + 1/8 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + Low quality preview + True + 1/4 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + Medium quality preview + True + 1/2 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + High quality preview + True + 1/1 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 3 + False + True + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 250 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + Change Playback Mode + True + GTK_RELIEF_HALF + True + + + + + True + icon_playmode.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Mark current position as start of a new sample + True + [... + True + GTK_RELIEF_HALF + True + + + + 0 + False + False + + + + + + True + Mark current position as sample end and create new sample + True + ...] + True + GTK_RELIEF_HALF + True + + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + 352 + 288 + True + veejay-logo.png + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 185 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + Toggle Bezerk Mode + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_berserk.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Take Background Mask(diff overlay) + True + GTK_RELIEF_HALF + True + + + + + True + icon_mask.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 2 + 0 + 2 + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 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 + 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 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 2 + 0 + 0 + 2 + + + + True + False + 0 + + + + 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 + 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 + icon_bounce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 10 + 10 + 0 + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + + + + + + 0 + True + True + + + True @@ -10200,90 +10497,6 @@ MLZO - - - True - Sample - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 7 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - 00000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 5 - False - 0 - - - 3 - 4 - 0 - 1 - fill - - - - - - - True - M: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 4 - 5 - 0 - 1 - fill - - - - True @@ -10340,34 +10553,6 @@ MLZO - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 12 - False - 0 - - - 7 - 8 - 0 - 1 - fill - - - - True @@ -10423,6 +10608,119 @@ MLZO + + + + True + 00000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 5 + False + 0 + + + 3 + 4 + 0 + 1 + 8 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 12 + False + 0 + + + 7 + 8 + 0 + 1 + + + + + + + + True + Sample + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 7 + False + 0 + + + 2 + 3 + 0 + 1 + + + + + + + True + M: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 4 + 5 + 0 + 1 + 5 + fill + + + 0 @@ -10432,15 +10730,502 @@ MLZO - - 352 - 288 + True - veejay-logo.png - 0.5 - 0.5 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + False + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 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 + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 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 + + + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 50 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 50 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 1 0 13 0 0 0 + + + + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + 0 @@ -10468,794 +11253,6 @@ MLZO False - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 10 - 10 - 0 - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - - - - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 4 - 0 - 4 - 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 - True - True - - - - - - True - False - 0 - - - - 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 - 0.5 - 0.5 - 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 - - - - - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 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 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - False - True - - 0 @@ -11299,20 +11296,52 @@ MLZO 0 - + True False 0 - + True - True - << - True - GTK_RELIEF_NONE - True - + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 50 + 0 + + + + True + True + GTK_RELIEF_NONE + True + + + + + True + button_back.png + 0.5 + 0.5 + 0 + 0 + + + + + + 0 @@ -11322,42 +11351,114 @@ MLZO - + True - Active bank: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_NONE - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 10 - + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + Active bank: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + + 0 + True + True + + + + + + + + + 0 + True + False + + + + + + 0 @@ -11367,14 +11468,46 @@ MLZO - + True - True - >> - True - GTK_RELIEF_NONE - True - + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 50 + + + + True + True + GTK_RELIEF_NONE + True + + + + + True + button_next.png + 0.5 + 0.5 + 0 + 0 + + + + + + 0 @@ -11977,126 +12110,513 @@ MLZO 0 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - 150 + True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - + False + 0 + + + + True + Take Screenshot + True + GTK_RELIEF_HALF + True + + + + + True + icon_screenshot.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + + + + localhost:3490 + True + GTK_RELIEF_HALF + True + + + + + True + icon_connect.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + Disconnect + True + GTK_RELIEF_HALF + True + + + + + True + icon_disconnect.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Display Debug + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_bug.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Enable jack + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_jack.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Display OSD status + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_osd.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Enable/Disable EDL Cache (see veejay console) + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_cache.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Drop audio/video frames and keep in sync (by default enabled) + True + Sync + True + GTK_RELIEF_NORMAL + True + True + False + + + + 0 + False + False + + - - 0 - True - True - - + + True + <b>Actions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True False 0 - + True True - True - True - 0 - - True - * - False - + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 150 + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + - 3 + 0 True True - + True - Send VIMS to veejay - True - GTK_RELIEF_HALF - True - + False + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + True + True + True + 0 + + True + * + False + + + + 3 + True + True + + + + + + True + Send VIMS to veejay + True + GTK_RELIEF_HALF + True + - + True - False - 2 + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - icon_send.png - 0.5 - 0.5 - 0 - 0 + False + 2 + + + + True + icon_send.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 0 - False - False - + + 0 + False + True + + + + + 0 + False + True + + + + + + True + False + 0 + + + + True + True + _Clear + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + repeat + True + GTK_RELIEF_NORMAL + True + False + False + + + 0 + False + False + @@ -12106,135 +12626,35 @@ MLZO - - 0 - False - True - - + True - False - 0 - - - - True - True - _Clear - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - repeat - True - GTK_RELIEF_NORMAL - True - False - False - - - 0 - False - False - - + <b>VIMS messenger</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True + label_item - - - - - True - <b>VIMS messenger</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True @@ -12254,7 +12674,7 @@ MLZO True - <b>VIMS</b> + <b>Veejay</b> False True GTK_JUSTIFY_LEFT @@ -13246,7 +13666,7 @@ MLZO 0 - 0 + 12 False False @@ -13844,7 +14264,7 @@ MLZO - 0 + 8 False True @@ -13852,7 +14272,6 @@ MLZO - True GTK_PROGRESS_LEFT_TO_RIGHT 0 0.10000000149 diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak index d5064cf0..2ccee6d0 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak @@ -54,7 +54,7 @@ True - + True button_loop.png 0.5 @@ -75,7 +75,7 @@ - + True icon_openlist.png 0.5 @@ -95,7 +95,7 @@ - + True icon_copy.png 0.5 @@ -115,7 +115,7 @@ - + True icon_clear.png 0.5 @@ -138,7 +138,7 @@ True - + True icon_stream.png 0.5 @@ -159,7 +159,7 @@ - + True icon_openlist.png 0.5 @@ -179,7 +179,7 @@ - + True icon_color.png 0.5 @@ -199,7 +199,7 @@ - + True icon_clear.png 0.5 @@ -222,7 +222,7 @@ True - + True icon_connect.png 0.5 @@ -267,7 +267,7 @@ True - + True icon_save.png 0.5 @@ -288,7 +288,7 @@ - + True icon_saveas.png 0.5 @@ -308,7 +308,7 @@ - + True icon_openlist.png 0.5 @@ -328,7 +328,7 @@ - + True icon_saveas.png 0.5 @@ -351,7 +351,7 @@ True - + True icon_open.png 0.5 @@ -372,7 +372,7 @@ - + True icon_open.png 0.5 @@ -392,7 +392,7 @@ - + True icon_openlist.png 0.5 @@ -412,7 +412,7 @@ - + True icon_open.png 0.5 @@ -470,7 +470,7 @@ - + True gtk-preferences 1 @@ -483,27 +483,6 @@ - - - True - VIMS Console - True - - - - - True - gtk-dialog-info - 1 - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -518,7 +497,7 @@ - + True icon_bundle.png 0.5 @@ -551,7 +530,7 @@ - + True icon_question.png 0.5 @@ -571,7 +550,7 @@ - + True icon_bug.png 0.5 @@ -644,451 +623,6 @@ False - - - - True - False - 0 - - - - True - True - preview on/off - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - - - - - True - True - gray - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Very low quality preview - True - 1/8 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - Low quality preview - True - 1/4 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - Medium quality preview - True - 1/2 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - High quality preview - True - 1/1 - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 3 - False - True - - - - - 0 - False - True - - - - - - True - False - 0 - - - - localhost:3490 - True - GTK_RELIEF_HALF - True - - - - - True - icon_connect.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - Disconnect - True - GTK_RELIEF_HALF - True - - - - - True - icon_disconnect.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Toggle Bezerk Mode - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_berserk.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Display Debug - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_bug.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Change Playback Mode - True - GTK_RELIEF_HALF - True - - - - - True - icon_playmode.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Take Background Mask(diff overlay) - True - GTK_RELIEF_HALF - True - - - - - True - icon_mask.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - True - - - - - - True - Enable jack - True - GTK_RELIEF_HALF - True - False - False - - - - - True - icon_jack.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Take Screenshot - True - GTK_RELIEF_HALF - True - - - - - True - icon_screenshot.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Display OSD status - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_osd.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - Enable/Disable EDL Cache (see veejay console) - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_cache.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - Drop audio/video frames and keep in sync (by default enabled) - True - Sync - True - GTK_RELIEF_NORMAL - True - True - False - - - - 0 - False - False - - - - - 0 - False - False - - 0 @@ -10135,6 +9669,769 @@ MLZO False 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 150 + 0 + + + + True + False + 0 + + + + True + True + preview on/off + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + True + gray + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + Very low quality preview + True + 1/8 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + Low quality preview + True + 1/4 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + Medium quality preview + True + 1/2 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + High quality preview + True + 1/1 + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 3 + False + True + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 250 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + Change Playback Mode + True + GTK_RELIEF_HALF + True + + + + + True + icon_playmode.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Mark current position as start of a new sample + True + [... + True + GTK_RELIEF_HALF + True + + + + 0 + False + False + + + + + + True + Mark current position as sample end and create new sample + True + ...] + True + GTK_RELIEF_HALF + True + + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + 352 + 288 + True + veejay-logo.png + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 185 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + Toggle Bezerk Mode + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_berserk.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Take Background Mask(diff overlay) + True + GTK_RELIEF_HALF + True + + + + + True + icon_mask.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 2 + 0 + 2 + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 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 + 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 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 2 + 0 + 0 + 2 + + + + True + False + 0 + + + + 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 + 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 + icon_bounce.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 10 + 10 + 0 + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + + + + + + 0 + True + True + + + True @@ -10200,90 +10497,6 @@ MLZO - - - True - Sample - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 7 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - 00000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 5 - False - 0 - - - 3 - 4 - 0 - 1 - fill - - - - - - - True - M: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 4 - 5 - 0 - 1 - fill - - - - True @@ -10340,34 +10553,6 @@ MLZO - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 12 - False - 0 - - - 7 - 8 - 0 - 1 - fill - - - - True @@ -10423,6 +10608,119 @@ MLZO + + + + True + 00000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 5 + False + 0 + + + 3 + 4 + 0 + 1 + 8 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 12 + False + 0 + + + 7 + 8 + 0 + 1 + + + + + + + + True + Sample + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 7 + False + 0 + + + 2 + 3 + 0 + 1 + + + + + + + True + M: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 4 + 5 + 0 + 1 + 5 + fill + + + 0 @@ -10432,15 +10730,502 @@ MLZO - - 352 - 288 + True - veejay-logo.png - 0.5 - 0.5 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + False + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 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 + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 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 + + + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 50 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 50 + True + True + True + GTK_POS_RIGHT + 0 + GTK_UPDATE_CONTINUOUS + False + 1 0 13 0 0 0 + + + + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + 0 @@ -10468,794 +11253,6 @@ MLZO False - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 10 - 10 - 0 - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - - - - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 4 - 0 - 4 - 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 - True - True - - - - - - True - False - 0 - - - - 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 - 0.5 - 0.5 - 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 - - - - - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 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 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - False - True - - 0 @@ -11299,20 +11296,52 @@ MLZO 0 - + True False 0 - + True - True - << - True - GTK_RELIEF_NONE - True - + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 50 + 0 + + + + True + True + GTK_RELIEF_NONE + True + + + + + True + button_back.png + 0.5 + 0.5 + 0 + 0 + + + + + + 0 @@ -11322,42 +11351,114 @@ MLZO - + True - Active bank: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_NONE - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 10 - + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + Active bank: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + + 0 + True + True + + + + + + + + + 0 + True + False + + + + + + 0 @@ -11367,14 +11468,46 @@ MLZO - + True - True - >> - True - GTK_RELIEF_NONE - True - + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 50 + + + + True + True + GTK_RELIEF_NONE + True + + + + + True + button_next.png + 0.5 + 0.5 + 0 + 0 + + + + + + 0 @@ -11977,126 +12110,513 @@ MLZO 0 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - 150 + True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - + False + 0 + + + + True + Take Screenshot + True + GTK_RELIEF_HALF + True + + + + + True + icon_screenshot.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + + + + localhost:3490 + True + GTK_RELIEF_HALF + True + + + + + True + icon_connect.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + Disconnect + True + GTK_RELIEF_HALF + True + + + + + True + icon_disconnect.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Display Debug + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_bug.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Enable jack + True + GTK_RELIEF_HALF + True + False + False + + + + + True + icon_jack.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Display OSD status + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_osd.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Enable/Disable EDL Cache (see veejay console) + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_cache.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Drop audio/video frames and keep in sync (by default enabled) + True + Sync + True + GTK_RELIEF_NORMAL + True + True + False + + + + 0 + False + False + + - - 0 - True - True - - + + True + <b>Actions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True False 0 - + True True - True - True - 0 - - True - * - False - + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 150 + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + - 3 + 0 True True - + True - Send VIMS to veejay - True - GTK_RELIEF_HALF - True - + False + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + True + True + True + 0 + + True + * + False + + + + 3 + True + True + + + + + + True + Send VIMS to veejay + True + GTK_RELIEF_HALF + True + - + True - False - 2 + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - icon_send.png - 0.5 - 0.5 - 0 - 0 + False + 2 + + + + True + icon_send.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 0 - False - False - + + 0 + False + True + + + + + 0 + False + True + + + + + + True + False + 0 + + + + True + True + _Clear + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + repeat + True + GTK_RELIEF_NORMAL + True + False + False + + + 0 + False + False + @@ -12106,135 +12626,35 @@ MLZO - - 0 - False - True - - + True - False - 0 - - - - True - True - _Clear - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - repeat - True - GTK_RELIEF_NORMAL - True - False - False - - - 0 - False - False - - + <b>VIMS messenger</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True + label_item - - - - - True - <b>VIMS messenger</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True @@ -12254,7 +12674,7 @@ MLZO True - <b>VIMS</b> + <b>Server</b> False True GTK_JUSTIFY_LEFT @@ -13246,7 +13666,7 @@ MLZO 0 - 0 + 12 False False @@ -13844,7 +14264,7 @@ MLZO - 0 + 8 False True @@ -13852,7 +14272,6 @@ MLZO - True GTK_PROGRESS_LEFT_TO_RIGHT 0 0.10000000149 diff --git a/veejay-current/veejay-client/share/icon_looponce.png b/veejay-current/veejay-client/share/icon_looponce.png index 3e2e20d9..08475a7d 100644 Binary files a/veejay-current/veejay-client/share/icon_looponce.png and b/veejay-current/veejay-client/share/icon_looponce.png differ diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index 9d412e9f..bce03e15 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -2772,7 +2772,10 @@ on_spin_samplebank_select_value_changed if(page >= max_page){ /* @mvh I know this is not pretty but why make it difficult */ page = 0; gtk_spin_button_set_value(spinbutton, page); - }//if + } else if( page < 0 ) { + page = max_page; + gtk_spin_button_set_value(spinbutton,page); + } gtk_notebook_set_current_page(samplebank, page); } void diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index e4e7dd1a..826f5aca 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -19,10 +19,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * If you are reading this code , you are insane. - */ - #include #include #include @@ -2744,7 +2740,7 @@ static void update_current_slot(int *history, int pm, int last_pm) } /* Actions for stream */ - if( pm != last_pm && pm == MODE_STREAM ) + if( ( info->status_tokens[CURRENT_ID] != history[CURRENT_ID] || pm != last_pm ) && pm == MODE_STREAM ) { /* Is a solid color stream */ if( info->status_tokens[STREAM_TYPE] == STREAM_WHITE ) @@ -2758,10 +2754,11 @@ static void update_current_slot(int *history, int pm, int last_pm) } - update_label_str( "label_currentsource", "Stream" ); gchar *time = format_time( info->status_frame,info->el.fps ); update_label_str( "label_curtime", time ); g_free(time); + + update_label_str( "playhint", "Streaming"); } /* Actions for sample */ @@ -2865,6 +2862,13 @@ static void update_current_slot(int *history, int pm, int last_pm) if( speed < 0 ) info->play_direction = -1; else info->play_direction = 1; if( speed < 0 ) speed *= -1; update_spin_value( "spin_samplespeed", speed); + + if( pm == MODE_SAMPLE ) { + if( speed == 0 ) + update_label_str( "playhint", "Paused" ); + else + update_label_str( "playhint", "Playing"); + } } if( history[FRAME_DUP] != info->status_tokens[FRAME_DUP] ) @@ -2890,8 +2894,6 @@ static void update_current_slot(int *history, int pm, int last_pm) gchar *time = format_selection_time( 0, len ); g_free(time); - update_label_str( "label_currentsource", "Sample"); - update_spin_value( "spin_samplestart", info->status_tokens[SAMPLE_START]); update_spin_value( "spin_sampleend", info->status_tokens[SAMPLE_END]); @@ -3902,6 +3904,7 @@ static void load_samplelist_info(gboolean with_reset_slotselection) if( with_reset_slotselection ) reset_samplebank(); + multi_vims( VIMS_SAMPLE_LIST,"%d", 0 ); gint fxlen = 0; gchar *fxtext = recv_vims(5,&fxlen); @@ -5487,6 +5490,7 @@ static void update_status_accessibility(int old_pm, int new_pm) enable_widget( streamwidgets[i].name); update_label_str( "label_current_mode", "Stream"); + update_label_str( "label_current_mode", "Stream"); } if( new_pm == MODE_SAMPLE ) @@ -5499,6 +5503,8 @@ static void update_status_accessibility(int old_pm, int new_pm) enable_widget( samplewidgets[i].name); update_label_str( "label_current_mode", "Sample"); + update_label_str( "label_currentsource", "Sample" ); + } if( new_pm == MODE_PLAIN) @@ -5511,6 +5517,8 @@ static void update_status_accessibility(int old_pm, int new_pm) enable_widget( plainwidgets[i].name); update_label_str( "label_current_mode","Plain"); + update_label_str( "label_currentsource", "Plain" ); + } GtkWidget *n = glade_xml_get_widget_( info->main_window, "panels" ); int page_needed = 0; @@ -5572,6 +5580,7 @@ static void update_globalinfo(int *history, int pm, int last_pm) timeline_set_selection( info->tl, FALSE ); select_slot( info->status_tokens[PLAY_MODE] ); + #ifdef STRICT_CHECKING if( pm != MODE_PLAIN ) @@ -5692,6 +5701,12 @@ veejay_msg(0, "%s",time); else info->play_direction = 1; if( plainspeed < 0 ) plainspeed *= -1; + if( plainspeed == 0 ) { + update_label_str( "playhint", "Paused"); + } else { + update_label_str( "playhint", "Playing"); + } + } } @@ -7471,8 +7486,10 @@ static gboolean on_slot_activated_by_mouse (GtkWidget *widget, GdkEventButton *e if( event->type == GDK_2BUTTON_PRESS ) { sample_slot_t *s = sample_banks[bank_nr]->slot[slot_nr]; - multi_vims( VIMS_SET_MODE_AND_GO, "%d %d", s->sample_type, s->sample_id); + multi_vims( VIMS_SET_MODE_AND_GO, "%d %d", (s->sample_type==0? 0:1), s->sample_id); vj_midi_learning_vims_msg2( info->midi, NULL, VIMS_SET_MODE_AND_GO, s->sample_type, s->sample_id ); + vj_msg(VEEJAY_MSG_INFO, "Start playing %s %d", + (s->sample_type==0 ? "Sample" : "Stream" ), s->sample_id ); } else if(event->type == GDK_BUTTON_PRESS ) {