From fcb654a4623baea38764400f1e83c69c9cf4201d Mon Sep 17 00:00:00 2001 From: c0ntrol Date: Tue, 15 Mar 2016 19:07:17 +0100 Subject: [PATCH] fix issue #86 --- .../share/gveejay.reloaded.glade | 10 ++++++ veejay-current/veejay-client/src/callback.c | 35 +++++-------------- veejay-current/veejay-client/src/vj-api.c | 5 ++- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index 246b35a9..11833cbd 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -1244,6 +1244,16 @@ True False + + + + + _New Yuv4Mpeg + True + False + True + False + diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index 75557ea9..ad32f03b 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -2166,43 +2166,24 @@ void on_inputstream_button_clicked(GtkWidget *widget, gpointer user_data) void on_inputstream_filebrowse_clicked(GtkWidget *w, gpointer user_data) { - gchar *filename = dialog_open_file( "Open new input stream",3 ); + gchar *filename = dialog_open_file( "Select Action File",2 ); if(filename) { put_text( "inputstream_filename", filename ); g_free(filename); } } -/* -void on_inputstream_file_button_clicked(GtkWidget *w, gpointer user_data) -{ - gint use_y4m = is_button_toggled( "inputstream_filey4m" ); - gint use_ffmpeg = is_button_toggled( "inputstream_fileffmpeg"); - gint use_pic = is_button_toggled( "inputstream_filepixbuf"); - - gchar *file = get_text( "inputstream_filename" ); - gint br = 0; - gint bw = 0; - gchar *filename = g_locale_from_utf8( file, -1, &br , &bw, NULL ); - if( br == 0 || bw == 0 ) - { - error_dialog("Error", "Please enter a filename"); +void on_y4m_new_clicked(GtkWidget *w, gpointer user_data) +{ + gchar *filename = dialog_open_file( "Select YUV4MPEG input (fifo) file",3); + if(!filename) return; - } - if(use_y4m) - multi_vims( VIMS_STREAM_NEW_Y4M, "%s", filename ); - if(use_ffmpeg) - multi_vims( VIMS_STREAM_NEW_AVFORMAT, "%s", filename ); -#ifdef USE_GDK_PIXBUF - if(use_pic) - multi_vims( VIMS_STREAM_NEW_PICTURE, "%s", filename); -#endif + + multi_vims( VIMS_STREAM_NEW_Y4M, "%s", filename ); gveejay_new_slot(MODE_STREAM); - - if(filename) g_free( filename ); -}*/ +} void on_samplerand_toggled(GtkWidget *widget, gpointer user_data) { diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index bffaee18..66d87477 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -1605,7 +1605,10 @@ static void add_file_filters(GtkWidget *dialog, int type ) } if(type == 3 ) { - //ffmpeg + filter = gtk_file_filter_new(); + gtk_file_filter_set_name( filter, "YUV4MPEG files (*.yuv)"); + gtk_file_filter_add_pattern( filter, "*.yuv" ); + gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(dialog), filter); } filter = gtk_file_filter_new();