diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index 75590171..2ad08ccc 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -16951,7 +16951,7 @@ YUV (current) 0 - 0 + 4 False False diff --git a/veejay-current/veejay-client/share/veejay-logo.png b/veejay-current/veejay-client/share/veejay-logo.png index 00740d08..34f421dd 100644 Binary files a/veejay-current/veejay-client/share/veejay-logo.png and b/veejay-current/veejay-client/share/veejay-logo.png differ diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index e56ced82..d9331734 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -2551,10 +2551,11 @@ void on_previewtoggle_toggled(GtkWidget *w, gpointer user_data) } multitrack_set_quality( info->mt, info->quality ); - multitrack_toggle_preview( info->mt, +/* multitrack_toggle_preview( info->mt, -1, 1, - glade_xml_get_widget(info->main_window,"imageA")); //@ enable + glade_xml_get_widget(info->main_window,"imageA")); + */ //@ enable // setup_samplebank( NUM_SAMPLES_PER_COL, NUM_SAMPLES_PER_ROW ); } diff --git a/veejay-current/veejay-client/src/multitrack.c b/veejay-current/veejay-client/src/multitrack.c index e2dfa5f1..cefdf677 100644 --- a/veejay-current/veejay-client/src/multitrack.c +++ b/veejay-current/veejay-client/src/multitrack.c @@ -42,7 +42,7 @@ #include #include #include - +#include #define __MAX_TRACKS 64 typedef struct { @@ -962,11 +962,11 @@ void multitrack_configure( void *data, float fps, int video_width, int video_he mt->aspect_ratio = r; if( mt->height > 300 ) { - mt->height = 288; + mt->height = DEFAULT_PREVIEW_HEIGHT; mt->width = (int) ( (float) mt->height * r ); } if( mt->width > 360 ) { - mt->width = 352; + mt->width = DEFAULT_PREVIEW_WIDTH; mt->height = mt->width / r; } diff --git a/veejay-current/veejay-client/src/multitrack.h b/veejay-current/veejay-client/src/multitrack.h index b078deb6..0875406a 100644 --- a/veejay-current/veejay-client/src/multitrack.h +++ b/veejay-current/veejay-client/src/multitrack.h @@ -1,6 +1,9 @@ #ifndef MTRACK_H #define MTRACK_H - + +#define DEFAULT_PREVIEW_WIDTH (int)(352.0f*0.85f) +#define DEFAULT_PREVIEW_HEIGHT (int)(288.0f*0.85f) + void *multitrack_new( void (*f)(int,char*,int), int (*g)(GdkPixbuf *, GdkPixbuf *, GtkImage *), diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 3ccb53e4..fc9095b4 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -678,8 +678,9 @@ static struct { NULL }, }; -static int preview_box_w_ = 352; -static int preview_box_h_ = 288; +static int preview_box_w_ = DEFAULT_PREVIEW_WIDTH; +static int preview_box_h_ = DEFAULT_PREVIEW_HEIGHT; + static void *bankport_ = NULL; @@ -5526,7 +5527,7 @@ int veejay_update_multitrack( void *data ) gdk_pixbuf_get_width(s->img_list[i]) >= 320 ) gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), s->img_list[i] ); else { - GdkPixbuf *result = vj_gdk_pixbuf_scale_simple( s->img_list[i],352,288, GDK_INTERP_NEAREST ); + GdkPixbuf *result = vj_gdk_pixbuf_scale_simple( s->img_list[i],DEFAULT_PREVIEW_WIDTH,DEFAULT_PREVIEW_HEIGHT, GDK_INTERP_NEAREST ); gtk_image_set_from_pixbuf_( GTK_IMAGE( maintrack ), result ); gdk_pixbuf_unref(result); @@ -6288,8 +6289,8 @@ void vj_gui_cb(int state, char *hostname, int port_num) void vj_gui_setup_defaults( vj_gui_t *gui ) { - gui->config.w = 352; - gui->config.h = 288; + gui->config.w = DEFAULT_PREVIEW_WIDTH; + gui->config.h = DEFAULT_PREVIEW_HEIGHT; gui->config.fps = 25.0; gui->config.sampling = 1; gui->config.pixel_format = 1; @@ -6721,10 +6722,10 @@ void vj_gui_preview(void) update_spin_value( "priout_width", w ); update_spin_value( "priout_height", h ); - if( w > 352 ) - w = 352; - if( h > 288 ) - h = 288; + if( w > DEFAULT_PREVIEW_WIDTH ) + w = DEFAULT_PREVIEW_WIDTH; + if( h > DEFAULT_PREVIEW_HEIGHT ) + h = DEFAULT_PREVIEW_HEIGHT; update_spin_range( "preview_width", 16, w, (info->run_state == RUN_STATE_REMOTE ? (default_preview_width_==0 ? w/4: default_preview_width_) : w ) );