diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index a647e747..bf1daac6 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -5876,7 +5876,7 @@ True False - 0 + 2 @@ -5979,155 +5979,169 @@ 0 - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 6 + 0 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - 0 - 0.5 - GTK_SHADOW_NONE + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - 00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 7 - False - 0 - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 + 00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 0.5 - 1 - 1 - 0 - 0 - 200 - 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 7 + False + 0 + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 200 + 0 - + True - True - Loops - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - + False + 0 - - - True - True - Frames - True - GTK_RELIEF_HALF - True - True - False - True - sample_mulloop - + + + True + True + Loops + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Frames + True + GTK_RELIEF_HALF + True + True + False + True + sample_mulloop + + + + 0 + False + False + + - - 0 - False - False - + + 0 + True + True + - - 0 - True - True - @@ -6135,71 +6149,11 @@ - - - - - - True - <b>Timecode</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 - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 9999999 1 10 10 - - - - - - - True - <b>Duration</b> + <b>Timecode</b> False True GTK_JUSTIFY_LEFT @@ -6221,23 +6175,81 @@ 0 - True + False True - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - - 120 + True - MJPEG + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 9999999 1 10 10 + + + + + + + True + <b>Duration</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 + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + 120 + True + MJPEG DVVIDEO MPEG4 MSMPEG4V3 @@ -6246,134 +6258,161 @@ YV16 Quicktime-DV Quicktime-MJPEG MLZO - False - True - True - - + False + True + True + + - - - True - <b>Codec</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + <b>Codec</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + - label_item + 0 + True + True 0 - True + False True - - - 0 - False - True - - - - - - True - False - 0 - + True False 0 - + True - Start recording - True - GTK_RELIEF_HALF - True - + False + 0 - + True - icon_record.png - 0.5 - 0.5 - 0 - 0 + Start recording + True + GTK_RELIEF_HALF + True + + + + + True + icon_record.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + True + + + + + + True + Cancel recording + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_recordstop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + 0 - False + True True - + True - Cancel recording + Auto play sample after recording True + Autoplay + True GTK_RELIEF_HALF True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_recordstop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - + False + False + True 0 @@ -6384,36 +6423,11 @@ MLZO 0 - True + False True - - - - True - Auto play sample after recording - True - Autoplay - True - GTK_RELIEF_HALF - True - False - False - True - - - 0 - False - False - - - - 0 - False - True - @@ -6885,257 +6899,81 @@ MLZO - + True - True - False + False 0 - + + True + True + True + False + False + True + False + False + False + + + 0 + True + True + + + + + True False 0 - + True + Create sample from selection True - True - False - False - True - False - False - False - - - 0 - True - True - - - - - - True - False - 0 + GTK_RELIEF_HALF + True + - + True - Create sample from selection - True - GTK_RELIEF_HALF - True - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 2 - + True - False - 2 - - - - True - icon_new.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + icon_new.png + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + - - 0 - False - False - - - - - - True - Save EditList - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_save.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Save Selection - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_saveas.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Add Videofiles to EditList - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_open.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - @@ -7146,816 +6984,960 @@ MLZO - + True - 2 - 3 - False - 0 - 0 + Save EditList + True + GTK_RELIEF_HALF + True + - + True - 00000000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 12 - False - 0 - - - 1 - 2 - 1 - 2 - - - + 0 + 0 + 0 + 0 + 0 + 0 - - - True - Positon - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - + + + True + False + 2 - - - True - Total frames - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + icon_save.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 1 - 2 - - - - - - - True - 000000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 11 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 11 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - 0 False - True + False - + True - 3 - 2 - False - 0 - 5 + Save Selection + True + GTK_RELIEF_HALF + True + - + True - <i>Starting position</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - + 0 + 0 + 0 + 0 + 0 + 0 - - - True - <i>Duration:</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - + + + True + False + 2 - - - True - <i>Ending position:</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + icon_saveas.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 2 - 3 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 2 - 3 - - 0 False - True + False - + True - 2 - 2 - False - 0 - 0 + Add Videofiles to EditList + True + GTK_RELIEF_HALF + True + - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - - 1 - 2 - 1 - 2 - - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - - 1 - 2 - 0 - 1 - - + + + True + False + 2 - - - True - Take current position as starting position - True - Set start - True - GTK_RELIEF_HALF - True - + + + True + icon_open.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Take current position as ending position - True - Set end - True - GTK_RELIEF_HALF - True - - - - 0 - 1 - 1 - 2 - fill - - 0 False - True - - - - - - True - False - 0 - - - - True - Cut selection to buffer - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_cut.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Copy selection to buffer - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_copy.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Paste from buffer into editlist at current position - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_paste.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Delete selection (without buffer) - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_trash.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Crop to selection - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_crop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Paste at this position - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - 0 - True - True - - - - - - True - Paste buffer at position - True - GTK_RELIEF_HALF - True - - - - - True - icon_paste.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - False - True + False + + 0 + False + False + - + True - <b>EditList Operations</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 3 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 2 + 3 + False + 0 + 0 + + + + True + 00000000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 12 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + Positon + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + True + Total frames + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + 000000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 11 + False + 0 + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 11 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + - label_item + 0 + False + True + + + + + + True + 3 + 2 + False + 0 + 5 + + + + True + <i>Starting position</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + <i>Duration:</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + True + <i>Ending position:</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 0 + 1 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 2 + 3 + + + + + + 0 + False + True + + + + + + True + 2 + 2 + False + 0 + 0 + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + + 1 + 2 + 1 + 2 + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + + 1 + 2 + 0 + 1 + + + + + + True + Take current position as starting position + True + Set start + True + GTK_RELIEF_HALF + True + + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Take current position as ending position + True + Set end + True + GTK_RELIEF_HALF + True + + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + False + True + + + + + + True + False + 0 + + + + True + Cut selection to buffer + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_cut.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Copy selection to buffer + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_copy.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Paste from buffer into editlist at current position + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_paste.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Delete selection (without buffer) + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_trash.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Crop to selection + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_crop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Paste at this position + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + 0 + True + True + + + + + + True + Paste buffer at position + True + GTK_RELIEF_HALF + True + + + + + True + icon_paste.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 0 + False + True diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak index ded3823d..be43a4e4 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 @@ -240,7 +240,7 @@ True _learn MIDI True - True + False @@ -250,7 +250,7 @@ True _MIDI enable True - True + False midilearn @@ -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 @@ -497,7 +497,7 @@ - + True icon_bundle.png 0.5 @@ -530,7 +530,7 @@ - + True icon_question.png 0.5 @@ -550,7 +550,7 @@ - + True icon_bug.png 0.5 @@ -5866,7 +5866,8 @@ True - False + True + True False GTK_POS_TOP False @@ -5876,7 +5877,7 @@ True False - 0 + 2 @@ -5979,155 +5980,169 @@ 0 - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 6 + 0 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - 0 - 0.5 - GTK_SHADOW_NONE + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - 00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 7 - False - 0 - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 + 00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 0.5 - 1 - 1 - 0 - 0 - 200 - 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 7 + False + 0 + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 200 + 0 - + True - True - Loops - True - GTK_RELIEF_HALF - True - False - False - True - - - - 0 - False - False - - + False + 0 - - - True - True - Frames - True - GTK_RELIEF_HALF - True - True - False - True - sample_mulloop - + + + True + True + Loops + True + GTK_RELIEF_HALF + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Frames + True + GTK_RELIEF_HALF + True + True + False + True + sample_mulloop + + + + 0 + False + False + + - - 0 - False - False - + + 0 + True + True + - - 0 - True - True - @@ -6135,71 +6150,11 @@ - - - - - - True - <b>Timecode</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 - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 9999999 1 10 10 - - - - - - - True - <b>Duration</b> + <b>Timecode</b> False True GTK_JUSTIFY_LEFT @@ -6221,23 +6176,81 @@ 0 - True + False True - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - - 120 + True - MJPEG + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 9999999 1 10 10 + + + + + + + True + <b>Duration</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 + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + 120 + True + MJPEG DVVIDEO MPEG4 MSMPEG4V3 @@ -6246,134 +6259,161 @@ YV16 Quicktime-DV Quicktime-MJPEG MLZO - False - True - True - - + False + True + True + + - - - True - <b>Codec</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + <b>Codec</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + - label_item + 0 + True + True 0 - True + False True - - - 0 - False - True - - - - - - True - False - 0 - + True False 0 - + True - Start recording - True - GTK_RELIEF_HALF - True - + False + 0 - + True - icon_record.png - 0.5 - 0.5 - 0 - 0 + Start recording + True + GTK_RELIEF_HALF + True + + + + + True + icon_record.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + True + + + + + + True + Cancel recording + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_recordstop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + 0 - False + True True - + True - Cancel recording + Auto play sample after recording True + Autoplay + True GTK_RELIEF_HALF True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_recordstop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - + False + False + True 0 @@ -6384,36 +6424,11 @@ MLZO 0 - True + False True - - - - True - Auto play sample after recording - True - Autoplay - True - GTK_RELIEF_HALF - True - False - False - True - - - 0 - False - False - - - - 0 - False - True - @@ -6885,257 +6900,81 @@ MLZO - + True - True - False + False 0 - + + True + True + True + False + False + True + False + False + False + + + 0 + True + True + + + + + True False 0 - + True + Create sample from selection True - True - False - False - True - False - False - False - - - 0 - True - True - - - - - - True - False - 0 + GTK_RELIEF_HALF + True + - + True - Create sample from selection - True - GTK_RELIEF_HALF - True - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 2 - + True - False - 2 - - - - True - icon_new.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + icon_new.png + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + - - 0 - False - False - - - - - - True - Save EditList - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_save.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Save Selection - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_saveas.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Add Videofiles to EditList - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_open.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - @@ -7146,816 +6985,960 @@ MLZO - + True - 2 - 3 - False - 0 - 0 + Save EditList + True + GTK_RELIEF_HALF + True + - + True - 00000000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 12 - False - 0 - - - 1 - 2 - 1 - 2 - - - + 0 + 0 + 0 + 0 + 0 + 0 - - - True - Positon - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - + + + True + False + 2 - - - True - Total frames - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + icon_save.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 1 - 2 - - - - - - - True - 000000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 11 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 11 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - 0 False - True + False - + True - 3 - 2 - False - 0 - 5 + Save Selection + True + GTK_RELIEF_HALF + True + - + True - <i>Starting position</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - + 0 + 0 + 0 + 0 + 0 + 0 - - - True - <i>Duration:</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - + + + True + False + 2 - - - True - <i>Ending position:</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + icon_saveas.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 2 - 3 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - 0:00:00:00 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 10 - 0 - PANGO_ELLIPSIZE_NONE - 10 - False - 0 - - - 1 - 2 - 2 - 3 - - 0 False - True + False - + True - 2 - 2 - False - 0 - 0 + Add Videofiles to EditList + True + GTK_RELIEF_HALF + True + - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - - 1 - 2 - 1 - 2 - - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - - 1 - 2 - 0 - 1 - - + + + True + False + 2 - - - True - Take current position as starting position - True - Set start - True - GTK_RELIEF_HALF - True - + + + True + icon_open.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Take current position as ending position - True - Set end - True - GTK_RELIEF_HALF - True - - - - 0 - 1 - 1 - 2 - fill - - 0 False - True - - - - - - True - False - 0 - - - - True - Cut selection to buffer - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_cut.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Copy selection to buffer - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_copy.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Paste from buffer into editlist at current position - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_paste.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Delete selection (without buffer) - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_trash.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Crop to selection - True - GTK_RELIEF_HALF - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - icon_crop.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - Paste at this position - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100000000 1 10 10 - - - 0 - True - True - - - - - - True - Paste buffer at position - True - GTK_RELIEF_HALF - True - - - - - True - icon_paste.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - False - True + False + + 0 + False + False + - + True - <b>EditList Operations</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 3 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 2 + 3 + False + 0 + 0 + + + + True + 00000000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 12 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + Positon + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + True + Total frames + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + 000000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 11 + False + 0 + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 11 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + - label_item + 0 + False + True + + + + + + True + 3 + 2 + False + 0 + 5 + + + + True + <i>Starting position</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + <i>Duration:</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + True + <i>Ending position:</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 0 + 1 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + 0:00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 10 + 0 + PANGO_ELLIPSIZE_NONE + 10 + False + 0 + + + 1 + 2 + 2 + 3 + + + + + + 0 + False + True + + + + + + True + 2 + 2 + False + 0 + 0 + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + + 1 + 2 + 1 + 2 + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + + 1 + 2 + 0 + 1 + + + + + + True + Take current position as starting position + True + Set start + True + GTK_RELIEF_HALF + True + + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Take current position as ending position + True + Set end + True + GTK_RELIEF_HALF + True + + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + False + True + + + + + + True + False + 0 + + + + True + Cut selection to buffer + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_cut.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Copy selection to buffer + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_copy.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Paste from buffer into editlist at current position + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_paste.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Delete selection (without buffer) + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_trash.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Crop to selection + True + GTK_RELIEF_HALF + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_crop.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + Paste at this position + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100000000 1 10 10 + + + 0 + True + True + + + + + + True + Paste buffer at position + True + GTK_RELIEF_HALF + True + + + + + True + icon_paste.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 0 + False + True diff --git a/veejay-current/veejay-client/src/gveejay.c b/veejay-current/veejay-client/src/gveejay.c index 19dfe787..20ae6c45 100644 --- a/veejay-current/veejay-client/src/gveejay.c +++ b/veejay-current/veejay-client/src/gveejay.c @@ -32,6 +32,7 @@ #include #include +extern int mt_get_max_tracks(); static int port_num = 3490; static char hostname[255]; @@ -91,6 +92,8 @@ static int set_option( const char *name, char *value ) else if (strcmp(name, "X") == 0 ) { n_tracks = atoi(optarg); + if( n_tracks < 1 || n_tracks > mt_get_max_tracks() ) + n_tracks = 1; } else if( strcmp(name, "t") == 0 || strcmp(name, "no-theme") == 0) { diff --git a/veejay-current/veejay-client/src/multitrack.c b/veejay-current/veejay-client/src/multitrack.c index f9fc69d8..08dfd0fb 100644 --- a/veejay-current/veejay-client/src/multitrack.c +++ b/veejay-current/veejay-client/src/multitrack.c @@ -114,6 +114,11 @@ extern void gtk_widget_set_size_request__( GtkWidget *w, gint iw, gint h, const #define gtk_widget_set_size_request_(a,b,c) gtk_widget_set_size_request__(a,b,c,__FUNCTION__,__LINE__) #endif +int mt_get_max_tracks() +{ + return __MAX_TRACKS; +} + static void gtk_image_set_from_pixbuf__( GtkImage *w, GdkPixbuf *p, const char *f, int l ) @@ -783,13 +788,18 @@ void *multitrack_new( gint max_h, GtkWidget *main_preview_area, void *infog, - int threads) + int threads, + int num_tracks) { multitracker_t *mt = NULL; #ifdef STRICT_CHECKING assert( max_w > 0 ); assert( max_h > 0 ); + assert( num_tracks > 0 ); #endif + + MAX_TRACKS = num_tracks; + mt = (multitracker_t*) vj_calloc(sizeof(multitracker_t)); mt->view = (sequence_view_t**) vj_calloc(sizeof(sequence_view_t*) * MAX_TRACKS ); mt->preview = NULL; diff --git a/veejay-current/veejay-client/src/multitrack.h b/veejay-current/veejay-client/src/multitrack.h index 1072b5b0..b078deb6 100644 --- a/veejay-current/veejay-client/src/multitrack.h +++ b/veejay-current/veejay-client/src/multitrack.h @@ -12,7 +12,8 @@ void *multitrack_new( gint max_h, GtkWidget *main_preview_area, void *gui, - int threads); + int threads, + int max_tracks); void multitrack_set_logo(void *data , GtkWidget *img); diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 99494f1a..c8ad2b12 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -88,7 +88,7 @@ static struct } tooltips[] = { {"Mouse left: Set in point, Mouse right: Set out point, Double click: Clear selected, Mouse middle: Drag selection"}, - {"Mouse left/right: Play slot, Shift + Mouse left: Put sample in slot"}, + {"Mouse left/right: Play slot, Shift + Mouse left: Put sample in slot. You can also put selected samples."}, {"Mouse left click: Select slot (sample in slot), Mouse double click: Play sample in slot, Mouse left + SHIFT: Set slot as mixing current mixing channel"}, {NULL}, }; @@ -503,7 +503,7 @@ void reloaded_schedule_restart(); static GtkWidget *effect_sources_tree = NULL; static GtkListStore *effect_sources_store = NULL; static GtkTreeModel *effect_sources_model = NULL; -static int num_tracks_ = 0; +static int num_tracks_ = 2; static int default_preview_width_ = 176; static int default_preview_height_ = 144; /* global pointer to the editlist-tree */ @@ -543,6 +543,7 @@ static void load_effectlist_info(); static void load_sequence_list(); static void load_samplelist_info(gboolean with_reset_slotselection); static void load_editlist_info(); +static void set_pm_page_label(int sample_id, int type); #ifndef STRICT_CHECKING static void disable_widget_( const char *name ); static void enable_widget_(const char *name ); @@ -973,7 +974,7 @@ static void setup_v4l_devices() g_object_unref( G_OBJECT( store )); setup_tree_text_column( "tree_v4ldevices", V4L_NUM, "#",0 ); - setup_tree_text_column( "tree_v4ldevices", V4L_NAME, "Device Name",1); + setup_tree_text_column( "tree_v4ldevices", V4L_NAME, "Device Name",240); setup_tree_spin_column( "tree_v4ldevices", V4L_SPINBOX, "Channel"); setup_tree_text_column( "tree_v4ldevices", V4L_LOCATION, "Location",0); @@ -2729,6 +2730,7 @@ static void update_current_slot(int *history, int pm, int last_pm) info->uc.reload_hint[HINT_HISTORY] = 1; put_text( "entry_samplename", "" ); + set_pm_page_label( info->status_tokens[CURRENT_ID], pm ); } if( info->status_tokens[CURRENT_ENTRY] != history[CURRENT_ENTRY] || info->uc.reload_hint[HINT_ENTRY] == 1 ) @@ -2766,11 +2768,6 @@ static void update_current_slot(int *history, int pm, int last_pm) /* Actions for sample */ if(last_pm != pm || pm == MODE_SAMPLE ) { - /* Update label and video slider*/ - update_label_i( "label_sampleposition", - info->status_tokens[FRAME_NUM] - info->status_tokens[SAMPLE_START] , 1); - - int marker_go = 0; /* Update marker bounds */ if( (history[SAMPLE_MARKER_START] != info->status_tokens[SAMPLE_MARKER_START]) ) @@ -3210,7 +3207,7 @@ static void setup_tree_text_column( const char *tree_name, int type, const char if(len) { - gtk_tree_view_column_set_min_width( column, 220); + gtk_tree_view_column_set_min_width( column, len); } } @@ -3235,7 +3232,7 @@ static void setup_effectchain_info( void ) g_object_unref( G_OBJECT( store )); setup_tree_text_column( "tree_chain", FXC_ID, "#",0 ); - setup_tree_text_column( "tree_chain", FXC_FXID, "Effect",1 ); + setup_tree_text_column( "tree_chain", FXC_FXID, "Effect",350 ); setup_tree_pixmap_column( "tree_chain", FXC_FXSTATUS, "Run"); // todo: could be checkbox!! setup_tree_pixmap_column( "tree_chain", FXC_KF , "Anim" ); // parameter interpolation on/off per entry GtkTreeSelection *selection; @@ -3723,8 +3720,8 @@ void setup_samplelist_info() effect_sources_model = gtk_tree_view_get_model( GTK_TREE_VIEW(effect_sources_tree )); effect_sources_store = GTK_LIST_STORE(effect_sources_model); - setup_tree_text_column( "tree_sources", SL_ID, "Id",0 ); - setup_tree_text_column( "tree_sources", SL_TIMECODE, "Length" ,0); + setup_tree_text_column( "tree_sources", SL_ID, "Id",175 ); + setup_tree_text_column( "tree_sources", SL_TIMECODE, "Length" ,175); GtkTreeSelection *selection; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(effect_sources_tree)); @@ -3929,12 +3926,11 @@ static void load_samplelist_info(gboolean with_reset_slotselection) strncpy( line, fxtext + offset, len ); int values[4]; - sscanf( line, "%05d%09d%09d%03d%s", - &values[0], &values[1], &values[2], &values[3], - descr ); + sscanf( line, "%05d%09d%09d%03d", + &values[0], &values[1], &values[2], &values[3]); + strncpy( descr, line + 5 + 9 + 9 + 3 , values[3] ); gchar *title = _utf8str( descr ); gchar *timecode = format_selection_time( 0,(values[2]-values[1]) ); - int int_id = values[0]; int poke_slot= 0; int bank_page = 0; verify_bank_capacity( &bank_page , &poke_slot, int_id, 0); @@ -4352,10 +4348,10 @@ static void setup_editlist_info() editlist_store = GTK_LIST_STORE(editlist_model); setup_tree_text_column( "editlisttree", COLUMN_INT, "#",0); - setup_tree_text_column( "editlisttree", COLUMN_STRING0, "Timecode",0 ); - setup_tree_text_column( "editlisttree", COLUMN_STRINGA, "Filename",0); - setup_tree_text_column( "editlisttree", COLUMN_STRINGB, "Duration",0); - setup_tree_text_column( "editlisttree", COLUMN_STRINGC, "FOURCC",0); + setup_tree_text_column( "editlisttree", COLUMN_STRING0, "Timecode",75 ); + setup_tree_text_column( "editlisttree", COLUMN_STRINGA, "Filename",300); + setup_tree_text_column( "editlisttree", COLUMN_STRINGB, "Duration",75); + setup_tree_text_column( "editlisttree", COLUMN_STRINGC, "FOURCC",50); g_signal_connect( editlist_tree, "row-activated", (GCallback) on_editlist_row_activated, NULL ); @@ -5491,8 +5487,6 @@ static void update_status_accessibility(int old_pm, int new_pm) for(i=0; streamwidgets[i].name != NULL; i++) enable_widget( streamwidgets[i].name); - update_label_str( "label_current_mode", "Stream"); - update_label_str( "label_current_mode", "Stream"); } if( new_pm == MODE_SAMPLE ) @@ -5503,10 +5497,6 @@ static void update_status_accessibility(int old_pm, int new_pm) disable_widget( plainwidgets[i].name); for(i=0; samplewidgets[i].name != NULL; i++) enable_widget( samplewidgets[i].name); - - update_label_str( "label_current_mode", "Sample"); - update_label_str( "label_currentsource", "Sample" ); - } if( new_pm == MODE_PLAIN) @@ -5518,9 +5508,6 @@ static void update_status_accessibility(int old_pm, int new_pm) for(i=0; plainwidgets[i].name != NULL; i++) 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; @@ -5541,6 +5528,21 @@ static void update_status_accessibility(int old_pm, int new_pm) } +static void set_pm_page_label(int sample_id, int type) +{ + gchar ostitle[100]; + switch(type) { + case 0: snprintf(ostitle, sizeof(ostitle), "Sample %d",sample_id);break; + case 1: snprintf(ostitle, sizeof(ostitle), "Stream %d",sample_id);break; + default: + snprintf(ostitle,sizeof(ostitle), "Plain");break; + } + gchar *title = _utf8str(ostitle); + update_label_str( "label_current_mode", title); + update_label_str( "label_currentsource", title ); + g_free(title); +} + static void update_globalinfo(int *history, int pm, int last_pm) { int i; @@ -5583,7 +5585,7 @@ static void update_globalinfo(int *history, int pm, int last_pm) select_slot( info->status_tokens[PLAY_MODE] ); - + #ifdef STRICT_CHECKING if( pm != MODE_PLAIN ) assert( info->selected_slot != NULL ); @@ -5630,6 +5632,7 @@ static void update_globalinfo(int *history, int pm, int last_pm) } update_spin_range("button_fadedur", 0, total_frames_, 0 ); update_label_i( "label_totframes", total_frames_, 1 ); + update_label_str( "label_samplelength",time); if( pm == MODE_PLAIN ) { for( i = 0; i < 3; i ++) @@ -5641,7 +5644,6 @@ static void update_globalinfo(int *history, int pm, int last_pm) update_spin_range( "button_el_selpaste", 0, total_frames_, info->selection[2]); } -veejay_msg(0, "%s",time); update_label_i( "label_totframes", total_frames_, 1 ); update_label_str( "label_totaltime", time ); if(pm == MODE_SAMPLE) @@ -5664,6 +5666,7 @@ veejay_msg(0, "%s",time); gchar *current_time_ = format_time( info->status_frame,info->el.fps ); update_label_i( "label_curframe", info->status_frame ,1 ); update_label_str( "label_curtime", current_time_ ); + update_label_str( "label_sampleposition", current_time_); g_free(current_time_); if( pm == MODE_SAMPLE ) @@ -5713,7 +5716,6 @@ veejay_msg(0, "%s",time); } update_current_slot(history, pm, last_pm); - // info->uc.playmode = pm; } @@ -6514,7 +6516,8 @@ void vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num, ph, img_wid, (void*) gui, - use_threads); + use_threads, + num_tracks_); if( theme_list ) { @@ -7097,13 +7100,21 @@ void setup_samplebank(gint num_cols, gint num_rows, GtkWidget *pad, int *idx, in result.height -= ( num_cols * 16); gint image_width = result.width / num_rows; gint image_height = result.height / num_cols; + + float ratio = (float) info->el.height / (float) info->el.width; image_height = image_width * ratio; - *idx = 64; - *idy = 64 * ratio; - // info->image_dimensions[0] = 64; - // info->image_dimensions[1] = 64 * ratio; -veejay_msg(0, "Image: %dx%d", image_width,image_height ); + *idx = image_width; + while( (image_width * ratio) > image_height ) + *idy = image_width * ratio; + + + gfloat w = image_width; + gfloat h = image_width * ratio; + + *idx = (int)w; + *idy = (int)h; + } veejay_msg(VEEJAY_MSG_INFO, "Sample bank image dimensions: %dx%d", *idx,*idy); } @@ -7457,7 +7468,9 @@ static void create_slot(gint bank_nr, gint slot_nr, gint w, gint h) gui_slot->title = gtk_label_new(""); gui_slot->timecode = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(gui_slot->timecode), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(gui_slot->timecode), 0.5, 0.0); + gtk_misc_set_alignment(GTK_MISC(gui_slot->title), 0.5, 0.0); + gtk_misc_set_padding (GTK_MISC(gui_slot->timecode), 0,0 ); gtk_box_pack_start (GTK_BOX (gui_slot->upper_vbox), GTK_WIDGET(gui_slot->timecode), FALSE, FALSE, 0); gtk_widget_show(GTK_WIDGET(gui_slot->timecode)); @@ -7720,8 +7733,8 @@ static void update_sample_slot_data(int page_num, int slot_num, int sample_id, g if(gui_slot) { -// if(gui_slot->title) -// gtk_label_set_text( GTK_LABEL( gui_slot->title ), slot->title ); + if(gui_slot->title) + gtk_label_set_text( GTK_LABEL( gui_slot->title ), slot->title ); if(gui_slot->timecode) gtk_label_set_text( GTK_LABEL( gui_slot->timecode ), slot->timecode ); @@ -7745,7 +7758,6 @@ static void update_sample_slot_data(int page_num, int slot_num, int sample_id, g slot->pixbuf = NULL; } } - } void veejay_release_track(int id, int release_this)