eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-21 23:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

regression

Browse Source
This commit is contained in:
niels
2015-05-01 22:35:36 +02:00
parent c9063548c7
commit 13fc780368
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/veejay-client/src/multitrack.c
View File

@@ -988,7 +988,7 @@ void multitrack_configure( void *data, float fps, int video_width, int video_he
multitracker_t *mt = (multitracker_t*) data; multitracker_t *mt = (multitracker_t*) data;
mt->fps = fps; mt->fps = fps;
calculate_img_dimension(video_width,video_height,&(mt->width),&(mt->height),&(mt->aspect_ratio),vj_get_preview_box_w(),vj_get_preview_box_h(),1); calculate_img_dimension(video_width,video_height,&(mt->width),&(mt->height),&(mt->aspect_ratio),vj_get_preview_box_w(),vj_get_preview_box_h(),-1);
*box_w = mt->width; *box_w = mt->width;
*box_h = mt->height; *box_h = mt->height;

3
veejay-current/veejay-client/src/utils.h
View File

@@ -23,9 +23,6 @@ int status_to_arr( char *status, int *array );
char *format_time( int pos , double fps); char *format_time( int pos , double fps);
#define DEFAULT_PREVIEW_WIDTH 520
#define DEFAULT_PREVIEW_HEIGHT 300
#define MAX_PREVIEW_WIDTH 520 #define MAX_PREVIEW_WIDTH 520
#define MAX_PREVIEW_HEIGHT 300 #define MAX_PREVIEW_HEIGHT 300

4
veejay-current/veejay-client/src/vj-api.c
View File

@@ -6644,8 +6644,8 @@ void vj_gui_cb(int state, char *hostname, int port_num)
void vj_gui_setup_defaults( vj_gui_t *gui ) void vj_gui_setup_defaults( vj_gui_t *gui )
{ {
gui->config.w = DEFAULT_PREVIEW_WIDTH; gui->config.w = MAX_PREVIEW_WIDTH;
gui->config.h = DEFAULT_PREVIEW_HEIGHT; gui->config.h = MAX_PREVIEW_HEIGHT;
gui->config.fps = 25.0; gui->config.fps = 25.0;
gui->config.sampling = 1; gui->config.sampling = 1;
gui->config.pixel_format = 1; gui->config.pixel_format = 1;