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

delete commented lines, change middle mouse button behaviour, dont grab mouse/keyboard in projection mapping setup

Browse Source
This commit is contained in:
niels
2015-05-10 23:12:04 +02:00
parent 524dcf5f78
commit 13ffdf562c
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veejay-current/veejay-server/libel/pixbuf.c
View File

@@ -403,9 +403,6 @@ void vj_picture_free()
void vj_fast_picture_save_to_mem( VJFrame *frame, int out_w, int out_h, int pixfmt )
{
// VJFrame *src1 = yuv_yuv_template( frame->data[0],frame->data[1],frame->data[2],
// frame->width,frame->height, frame->format );
uint8_t *dest[4];
dest[0] = vj_perform_get_preview_buffer();
dest[1] = dest[0] + (out_w * out_h);
@@ -433,15 +430,11 @@ void vj_fast_picture_save_to_mem( VJFrame *frame, int out_w, int out_h, int pixf
yuv_convert_and_scale( pic_scaler_, frame,dst1);
// free(src1);
free(dst1);
}
void vj_fastbw_picture_save_to_mem( VJFrame *frame, int out_w, int out_h, int pixfmt )
{
// VJFrame *src1 = yuv_yuv_template( frame->data[0],frame->data[1],frame->data[2],
// frame->width,frame->height, frame->format );
uint8_t *planes[4];
planes[0] = vj_perform_get_preview_buffer();
@@ -463,7 +456,6 @@ void vj_fastbw_picture_save_to_mem( VJFrame *frame, int out_w, int out_h, int p
yuv_convert_and_scale( pic_scaler_, frame, dst1);
// free(src1);
free(dst1);
}

2
veejay-current/veejay-server/veejay/vj-composite.c
View File

@@ -316,7 +316,7 @@ int composite_get_top(void *compiz, uint8_t *current_in[4], uint8_t *out[4], int
out[2] = current_in[2];
return c->frame1->format;
}
return c->frame1->format;
return c->frame1->format;
}
/* Top frame, blit */

18
veejay-current/veejay-server/veejay/vj-event.c
View File

@@ -7306,20 +7306,20 @@ void vj_event_viewport_frontback(void *ptr, const char format[], va_list ap)
}
composite_set_ui(v->composite, 0 );
v->settings->composite = 1;
#ifdef HAVE_SDL
if(v->video_out==0 || v->video_out == 2)
vj_sdl_grab( v->sdl[0], 0 );
#endif
//#ifdef HAVE_SDL
// if(v->video_out==0 || v->video_out == 2)
// vj_sdl_grab( v->sdl[0], 0 );
//#endif
}
else {
composite_set_ui( v->composite, 2 );
v->settings->composite = 2;
v->use_osd=3;
#ifdef HAVE_SDL
if(v->video_out==0 || v->video_out == 2)
vj_sdl_grab( v->sdl[0], 1 );
#endif
veejay_msg(VEEJAY_MSG_INFO, "You can now calibrate your projection/camera, press CTRL-s again to exit.");
//#ifdef HAVE_SDL
// if(v->video_out==0 || v->video_out == 2)
// vj_sdl_grab( v->sdl[0], 1 );
//#endif
veejay_msg(VEEJAY_MSG_INFO, "You can now calibrate your projection/camera, press CTRL-s again to save and exit.");
}
}

4
veejay-current/veejay-server/veejay/vj-viewport.c
View File

@@ -475,7 +475,7 @@ char *viewport_get_my_help(void *vv)
sprintf(startup_mode, "%s", (v->initial_active==1 ? "Active" :"Inactive" ));
int gw = v->grid_width;
int gh = v->grid_height;
sprintf(tmp, "Interactive Input/Projection calibration\nMouse Left: Set point\nCTRL + Cursor Keys: Finetune point\nMouse Left + RSHIFT: Set projection quad \nMouse Right: %s\nMouse Middle: Setup/Run\nMouse Middle + LSHIFT: Line Color\nCTRL + h:Hide/Show this Help\nCTRL + p:Enable/disable transform\nCTRL + a: %s on startup.\nCTRL + s: Exit this screen.\n%s\n\n",
sprintf(tmp, "Interactive Input/Projection calibration\nMouse Left: Set point\nCTRL + Cursor Keys: Finetune point\nMouse Left + RSHIFT: Set projection quad \nMouse Right: %s\nMouse Middle: Exit without saving\nMouse Middle + LSHIFT: Line Color\nCTRL + h:Hide/Show this Help\nCTRL + p:Enable/disable transform\nCTRL + a: %s on startup.\nCTRL + s: Exit this screen.\n%s\n\n",
reverse_mode,
startup_mode,
scroll_mode
@@ -2524,6 +2524,8 @@ int viewport_external_mouse( void *data, uint8_t *img[3], int sx, int sy, int bu
viewport_t *v = (viewport_t*) data;
if( sx == 0 && sy == 0 && button == 0 )
return 0;
if( button == 3 && v->user_ui == 0 )
return 0;
int ch = 0;
int width = v->w;