eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-06 06:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

reloaded, add status tokens (was missing 3 tokens), fixes updates in ui

Browse Source
This commit is contained in:
niels
2015-11-13 23:29:40 +01:00
parent 5256b132f6
commit 9808851598
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/veejay-client/share/gveejay.reloaded.glade
View File

@@ -10750,7 +10750,7 @@ YUV (current)</property>
<widget class="GtkSpinButton" id="button_fadedur">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">FX Chain Fade duration in frames</property>
<property name="tooltip" translatable="yes">FX Chain fade duration in frames</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>

7
veejay-current/veejay-client/src/utils.c
View File

@@ -28,7 +28,7 @@
int status_to_arr( char *status, int *array )
{
int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
array + 0,
array + 1,
array + 2,
@@ -51,7 +51,10 @@ int status_to_arr( char *status, int *array )
array + 19,
array + 20,
array + 21,
array + 22 );
array + 22,
array + 23,
array + 24,
array + 25 );
return n;
}

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

@@ -3030,7 +3030,7 @@ static void update_current_slot(int *history, int pm, int last_pm)
}
/* Actions for sample */
if( ( info->status_tokens[CURRENT_ID] != history[CURRENT_ID] || last_pm != pm) && pm == MODE_SAMPLE )
if( pm == MODE_SAMPLE )
{
int marker_go = 0;
@@ -3082,17 +3082,6 @@ static void update_current_slot(int *history, int pm, int last_pm)
update = 1;
}
if( (history[SAMPLE_START] != info->status_tokens[SAMPLE_START] ))
{
// update_spin_value( "spin_samplestart", info->status_tokens[SAMPLE_START] );
update = 1;
}
if( (history[SAMPLE_END] != info->status_tokens[SAMPLE_END] ))
{
// update_spin_value( "spin_sampleend", info->status_tokens[SAMPLE_END]);
update = 1;
}
if( marker_go )
{
info->uc.reload_hint[HINT_MARKER] = 1;
@@ -3143,6 +3132,15 @@ static void update_current_slot(int *history, int pm, int last_pm)
update_slider_value("slow_slider", info->status_tokens[FRAME_DUP],0);
}
if( (history[SAMPLE_START] != info->status_tokens[SAMPLE_START] ))
{
update = 1;
}
if( (history[SAMPLE_END] != info->status_tokens[SAMPLE_END] ))
{
update = 1;
}
if(update)
{