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

indenting

Browse Source
This commit is contained in:
veejay
2023-10-24 19:45:45 +02:00
parent 5699c7f967
commit 0e5d080a25
1 changed files with 428 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1568,7 +1568,7 @@ int vj_event_single_fire(void *ptr , SDL_Event event, int pressed)
{ {
if(event.type == SDL_MOUSEWHEEL && event.wheel.y >0 && v->use_osd != 3 ) { if(event.type == SDL_MOUSEWHEEL && event.wheel.y >0 && v->use_osd != 3 ) {
char msg[8]; char msg[8];
snprintf(msg,sizeof(msg),"%03d:;", sizeof(msg), VIMS_VIDEO_SKIP_SECOND ); snprintf(msg,sizeof(msg),"%03d:;", VIMS_VIDEO_SKIP_SECOND );
vj_event_parse_msg( (veejay_t*) ptr, msg, strlen(msg) ); vj_event_parse_msg( (veejay_t*) ptr, msg, strlen(msg) );
return 1; return 1;
} else if (event.type == SDL_MOUSEWHEEL && event.wheel.y < 0 && v->use_osd != 3) { } else if (event.type == SDL_MOUSEWHEEL && event.wheel.y < 0 && v->use_osd != 3) {
@@ -4000,12 +4000,23 @@ void vj_event_sample_grow_marker(void *ptr, const char format[], va_list ap)
int start = s->first_frame; int start = s->first_frame;
int end = s->last_frame; int end = s->last_frame;
int pos1 = s->marker_start; int pos1 = s->marker_start;
int pos2 = s->marker_end; int pos2 = s->marker_end;
if( pos1 == 0 && pos2 == 0 ) {
pos1 = start;
pos2 = end;
}
int npos1 = (pos1 + pos2) / 2 - ( pos2 - pos1 ); int npos1 = (pos1 + pos2) / 2 - ( pos2 - pos1 );
int npos2 = (pos1 + pos2) / 2 + ( pos2 - pos1 ); int npos2 = (pos1 + pos2) / 2 + ( pos2 - pos1 );
if( npos1 == npos2 ) {
npos1--;
npos2++;
}
if( npos1 < start ) npos1 = start; else if (npos1 > end) npos1 = end; if( npos1 < start ) npos1 = start; else if (npos1 > end) npos1 = end;
if( npos2 < start ) npos2 = start; else if (npos2 > end) npos2 = end; if( npos2 < start ) npos2 = start; else if (npos2 > end) npos2 = end;
@@ -4035,6 +4046,11 @@ void vj_event_sample_shrink_marker(void *ptr, const char format[], va_list ap)
int pos1 = s->marker_start; int pos1 = s->marker_start;
int pos2 = s->marker_end; int pos2 = s->marker_end;
if( pos1 == 0 && pos2 == 0 ) {
pos1 = start;
pos2 = end;
}
int npos1 = (pos1 + pos2) / 2 - (pos2 - pos1) / 4; int npos1 = (pos1 + pos2) / 2 - (pos2 - pos1) / 4;
int npos2 = (pos1 + pos2) / 2 + (pos2 - pos1) / 4; int npos2 = (pos1 + pos2) / 2 + (pos2 - pos1) / 4;