diff --git a/sandbox/veejay-client/share/gveejay.reloaded.glade b/sandbox/veejay-client/share/gveejay.reloaded.glade index 7f05188e..21d18c9d 100644 --- a/sandbox/veejay-client/share/gveejay.reloaded.glade +++ b/sandbox/veejay-client/share/gveejay.reloaded.glade @@ -16063,7 +16063,7 @@ MLZO True - viewportwindow + Viewport GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -16078,13 +16078,154 @@ MLZO False - + True False 0 - + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Video Out + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Video In + True + GTK_RELIEF_NORMAL + True + False + False + True + viewportarea_set_video_out + + + + 0 + False + False + + + + + + True + True + Color + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Grayscale + True + GTK_RELIEF_NORMAL + True + False + False + True + viewportarea_mode + + + + 0 + False + False + + + + + + + + + + True + <b>Viewport settings</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 diff --git a/sandbox/veejay-client/src/callback.c b/sandbox/veejay-client/src/callback.c index 85e94499..1095c5d4 100644 --- a/sandbox/veejay-client/src/callback.c +++ b/sandbox/veejay-client/src/callback.c @@ -191,6 +191,53 @@ void on_button_200_clicked(GtkWidget *widget, gpointer user_data) "Requested background mask of frame %d", info->status_tokens[FRAME_NUM] + 1 ); } + +void on_viewportarea_mode_toggled(GtkWidget *widget, gpointer user_data ) +{ + int gray = is_button_toggled( "viewportarea_mode_gray" ); + int color = is_button_toggled( "viewportarea_mode" ); + int front = is_button_toggled("viewportarea_set_video_out" ); + int back = is_button_toggled("viewportarea_set_video_in"); + + multi_vims(VIMS_PROJ_STACK, "%d %d", + ( front == 1 ? 0 : 1 ), ( gray == 1 ? 1 : 0 ) ); +} + +void on_viewport_mode_gray_toggled(GtkWidget *widget, gpointer user_data) +{ + int gray = is_button_toggled( "viewportarea_mode_gray" ); + int color = is_button_toggled( "viewportarea_mode" ); + int front = is_button_toggled("viewportarea_set_video_out" ); + int back = is_button_toggled("viewportarea_set_video_in"); + + multi_vims(VIMS_PROJ_STACK, "%d %d", + ( front == 1 ? 0 : 1 ), ( gray == 1 ? 1 : 0 ) ); + +} +void on_viewportarea_set_video_in_toggled(GtkWidget *widget, gpointer user_data) +{ + int gray = is_button_toggled( "viewportarea_mode_gray" ); + int color = is_button_toggled( "viewportarea_mode" ); + int front = is_button_toggled("viewportarea_set_video_out" ); + int back = is_button_toggled("viewportarea_set_video_in"); + + multi_vims(VIMS_PROJ_STACK, "%d %d", + ( front == 1 ? 0 : 1 ), ( gray == 1 ? 1 : 0 ) ); + +} + +void on_viewportarea_set_video_out_toggled( GtkWidget *widget, gpointer user_data ) +{ + int gray = is_button_toggled( "viewportarea_mode_gray" ); + int color = is_button_toggled( "viewportarea_mode" ); + int front = is_button_toggled("viewportarea_set_video_out" ); + int back = is_button_toggled("viewportarea_set_video_in"); + + multi_vims(VIMS_PROJ_STACK, "%d %d", + ( front == 1 ? 0 : 1 ), ( gray == 1 ? 1 : 0 ) ); + +} + void on_button_5_4_clicked(GtkWidget *widget, gpointer user_data) { if( is_button_toggled("button_5_4") ) diff --git a/sandbox/veejay-client/src/reloaded b/sandbox/veejay-client/src/reloaded index d9074cc9..f6db4c22 100755 Binary files a/sandbox/veejay-client/src/reloaded and b/sandbox/veejay-client/src/reloaded differ