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

bugfixes

Browse Source
This commit is contained in:
veejay
2023-09-03 22:30:26 +02:00
parent f740ee5ce3
commit e48f76d53e
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -454,9 +454,7 @@ void veejay_busy(veejay_t * info)
void veejay_quit(veejay_t * info)
{
vj_lock(info);
veejay_change_state(info, LAVPLAY_STATE_STOP);
vj_unlock(info);
veejay_change_state(info, LAVPLAY_STATE_STOP);
}

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

@@ -1179,6 +1179,8 @@ static unsigned char *get_font_name( vj_font_t *f,unsigned char *font, int id
if(fontName) free(fontName);
return NULL;
}
free(fontName);
fontName = nfontName;
}
int i;

1
veejay-current/veejay-server/veejay/vj-lib.h
View File

@@ -204,7 +204,6 @@ typedef struct {
int cx;
int cn;
int ca;
int fxrow[3];
int fxdepth;
int repeat_delay;
int repeat_interval;

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

@@ -66,7 +66,7 @@ typedef struct {
//static void vj_macro_print(vj_macro_t *macro);
static int vvm_[VIMS_QUIT];
static int vvm_[VIMS_QUIT+1];
void *vj_macro_new(void)
{
@@ -606,7 +606,7 @@ static void vj_macro_load_bank( void *ptr, xmlDocPtr doc, xmlNodePtr cur )
if( !xmlStrcmp( cur->name, (const xmlChar*) XMLTAG_MACRO_MESSAGES)) {
vj_macro_load_messages( ptr, key, doc, cur->xmlChildrenNode );
free(key);
if(key != NULL) { free(key); key = NULL; }
}
cur = cur->next;

3
veejay-current/veejay-server/veejay/vj-perform.c
View File

@@ -2190,7 +2190,6 @@ static void vj_perform_tag_render_chain_entry(veejay_t *info,performer_t *p,vjp_
}
vj_perform_apply_first(info,p,setup,frames,fx_entry,effect_id,chain_entry,(int) settings->current_frame_num,fx_entry->fx_instance,pm);
settings->fxrow[ chain_entry ] = effect_id;
if( p->pvar_.fade_entry == chain_entry && p->pvar_.fade_method == 2) {
vj_perform_pre_chain( p, frames[0] );
@@ -2267,7 +2266,6 @@ static int vj_perform_preprocess_secundary( veejay_t *info,performer_t *p, int
vj_perform_supersample( settings,p, subframes[0], subframes[1], sm );
vj_perform_apply_first(info,p,&setup,subframes,fx_entry,fx_id,n,(int) settings->current_frame_num,fx_entry->fx_instance, mode );
settings->fxrow[n] = fx_id;
}
break;
case VJ_PLAYBACK_MODE_TAG:
@@ -2288,7 +2286,6 @@ static int vj_perform_preprocess_secundary( veejay_t *info,performer_t *p, int
vj_perform_supersample(settings,p, subframes[0],subframes[1], sm);
vj_perform_apply_first(info,p,&setup,subframes,fx_entry,fx_id,n,(int) settings->current_frame_num,fx_entry->fx_instance, mode );
settings->fxrow[n] = fx_id;
}
break;
}