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

do not reload entry when fx anim panel is active

Browse Source
This commit is contained in:
niels
2015-10-31 01:45:30 +01:00
parent aaadc621d7
commit 44e59faced
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2878,7 +2878,7 @@ chain_update_row(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter,
gchar *descr = _utf8str( _effect_get_description( effect_id )); gchar *descr = _utf8str( _effect_get_description( effect_id ));
char tmp[128]; char tmp[128];
if( _effect_get_mix( effect_id ) ) { if( _effect_get_mix( effect_id ) ) {
snprintf(tmp,sizeof(tmp),"%s %d", (gui->uc.entry_tokens[ENTRY_SOURCE] == 0 ? "S" : "T" ), snprintf(tmp,sizeof(tmp),"%s %d", (gui->uc.entry_tokens[ENTRY_SOURCE] == 0 ? "Sample " : "T " ),
gui->uc.entry_tokens[ENTRY_CHANNEL]); gui->uc.entry_tokens[ENTRY_CHANNEL]);
} }
else { else {
@@ -3732,7 +3732,7 @@ static void load_effectchain_info()
gchar *utf8_name = _utf8str( name ); gchar *utf8_name = _utf8str( name );
char tmp[128]; char tmp[128];
if( _effect_get_mix( arr[0] ) ) { if( _effect_get_mix( arr[0] ) ) {
snprintf(tmp,sizeof(tmp),"%s %d", (info->uc.entry_tokens[ENTRY_SOURCE] == 0 ? "Sample" : "T " ), snprintf(tmp,sizeof(tmp),"%s %d", (info->uc.entry_tokens[ENTRY_SOURCE] == 0 ? "Sample " : "T " ),
info->uc.entry_tokens[ENTRY_CHANNEL]); info->uc.entry_tokens[ENTRY_CHANNEL]);
} }
else { else {
@@ -6056,9 +6056,13 @@ static void update_globalinfo(int *history, int pm, int last_pm)
} }
if( pm != MODE_PLAIN ) { if( pm != MODE_PLAIN ) {
if( (reload_entry_tick_ % ((int)info->el.fps/2))==0) { GtkWidget *ww = glade_xml_get_widget_( info->main_window, crappy_design[ui_skin_].name );
info->uc.reload_hint[HINT_ENTRY] = 1; int deckpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(ww));
} if(deckpage != 1) {
if( (reload_entry_tick_ % ((int)info->el.fps/2))==0) {
info->uc.reload_hint[HINT_ENTRY] = 1;
}
}
reload_entry_tick_++; reload_entry_tick_++;
} }