Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reloaded3 - fix sample record calculation + curve clear toggle_entry on initial_curve #219

Merged
merged 2 commits into from
Jun 19, 2019
Merged

Reloaded3 - fix sample record calculation + curve clear toggle_entry on initial_curve #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04fab81
Reloaded3 - fix sample record calculation
d-j-a-y Jun 17, 2019
ed2c324
Reloaded3 : curve - missing update on curve_buttonclear
d-j-a-y Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions veejay-current/veejay-client/src/callback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ static int bg_[4];
static int fg_[4];
static int ln_[4];

static int sample_calctime();
static inline int sample_calctime(int nframes);
static int sample_calctime_selection();
static int sample_calctime_mulloop();

static void change_box_color_rgb( GtkWidget *box, int r, int g, int b,int a, int fill );

Expand Down Expand Up @@ -1621,7 +1622,7 @@ void on_button_sample_recordstart_clicked(GtkWidget *widget, gpointer user_data)

if( is_button_toggled( "sample_mulloop" ) )
{
int base = sample_calctime();
int base = sample_calctime_mulloop();
n_frames = base * dur_val;
multi_vims( VIMS_SAMPLE_CLEAR_MARKER, "%d", 0 );
}
Expand Down
1 change: 0 additions & 1 deletion veejay-current/veejay-client/src/callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ update_label_str( "value_friendlyname", _effect_get_hint( entry_tokens[ENTRY_FXI
}\
}

/*int sample_calctime();*/
void text_defaults();

gboolean boxbg_draw ( GtkWidget *w, cairo_t *cr);
Expand Down
1 change: 1 addition & 0 deletions veejay-current/veejay-client/src/vj-api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3336,6 +3336,7 @@ static void update_curve_widget(GtkWidget *curve)
}
}
} else {
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CURVE_TOGGLEENTRY_PARAM]), FALSE );
set_initial_curve( curve, info->uc.entry_tokens[ENTRY_FXID], info->uc.selected_parameter_id,
lo, hi ,
info->uc.entry_tokens[ ENTRY_P0 + info->uc.selected_parameter_id ] );
Expand Down