Rx3/drmr2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lots of fixes (multi-layer, ui):

Browse Source 
- Fix ui to properly re-init sample table
- Fix ui to only adjust existing sliders
- Actually load multi-layer kits
- Play correct layer for multi-layer
This commit is contained in:
Nick Lanham
2012-02-13 16:11:30 +01:00
parent 9e760341b4
commit 45b2eeae22
5 changed files with 185 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
drmr_ui.c
View File

@@ -30,11 +30,14 @@ typedef struct {
GtkWidget *drmr_widget;
GtkTable *sample_table;
GtkComboBoxText *kit_combo;
GtkComboBox *kit_combo;
GtkListStore *kit_store;
GtkWidget** gain_sliders;
GtkWidget** pan_sliders;
int cols;
int samples;
GQuark gain_quark, pan_quark;
int curKit;
@@ -55,15 +58,12 @@ static void pan_callback(GtkRange* range, gpointer data) {
ui->write(ui->controller,pidx+DRMR_PAN_ONE,4,0,&pan);
}
static void fill_sample_table(DrMrUi* ui, int samples) {
static void fill_sample_table(DrMrUi* ui, int samples, GtkWidget** gain_sliders, GtkWidget** pan_sliders) {
int row = 0;
int col = 0;
int si;
gchar buf[32];;
GtkRequisition req;
int rows = (samples/ui->cols);
req.width=500;
req.height=500;
gtk_table_resize(ui->sample_table,rows,ui->cols);
for(si = 0;si<samples;si++) {
GtkWidget *frame,*hbox,*gain_vbox,*pan_vbox;
@@ -71,7 +71,7 @@ static void fill_sample_table(DrMrUi* ui, int samples) {
GtkWidget* pan_slider;
GtkWidget* gain_label;
GtkWidget* pan_label;
sprintf(buf,"<b>Sample %i</b>",si);
sprintf(buf,"<b>Sample %i</b>",(si+1));
frame = gtk_frame_new(buf);
gtk_label_set_use_markup(GTK_LABEL(gtk_frame_get_label_widget(GTK_FRAME(frame))),true);
@@ -81,8 +81,7 @@ static void fill_sample_table(DrMrUi* ui, int samples) {
gain_slider = gtk_vscale_new_with_range(GAIN_MIN,6.0,1.0);
g_object_set_qdata (G_OBJECT(gain_slider),ui->gain_quark,GINT_TO_POINTER(si));
g_signal_connect(G_OBJECT(gain_slider),"value-changed",G_CALLBACK(gain_callback),ui);
if (ui->gain_sliders)
ui->gain_sliders[si] = gain_slider;
if (gain_sliders) gain_sliders[si] = gain_slider;
gtk_range_set_inverted(GTK_RANGE(gain_slider),true);
gtk_scale_set_value_pos(GTK_SCALE(gain_slider),GTK_POS_BOTTOM);
gtk_range_set_value(GTK_RANGE(gain_slider),0.0);
@@ -94,8 +93,7 @@ static void fill_sample_table(DrMrUi* ui, int samples) {
gain_vbox = gtk_vbox_new(false,0);
pan_slider = gtk_hscale_new_with_range(-1.0,1.0,0.1);
if (ui->pan_sliders)
ui->pan_sliders[si] = pan_slider;
if (pan_sliders) pan_sliders[si] = pan_slider;
gtk_range_set_value(GTK_RANGE(pan_slider),0);
g_object_set_qdata (G_OBJECT(pan_slider),ui->pan_quark,GINT_TO_POINTER(si));
gtk_scale_add_mark(GTK_SCALE(pan_slider),0.0,GTK_POS_TOP,NULL);
@@ -103,7 +101,6 @@ static void fill_sample_table(DrMrUi* ui, int samples) {
pan_label = gtk_label_new("Pan");
pan_vbox = gtk_vbox_new(false,0);
gtk_box_pack_start(GTK_BOX(gain_vbox),gain_slider,true,true,0);
gtk_box_pack_start(GTK_BOX(gain_vbox),gain_label,false,false,0);
@@ -115,8 +112,6 @@ static void fill_sample_table(DrMrUi* ui, int samples) {
gtk_container_add(GTK_CONTAINER(frame),hbox);
gtk_widget_size_request(frame,&req);
gtk_table_attach_defaults(ui->sample_table,frame,col,col+1,row,row+1);
col++;
@@ -131,50 +126,38 @@ void kit_combobox_changed(GtkComboBox* box, gpointer data) {
DrMrUi* ui = (DrMrUi*)data;
gint new_kit = gtk_combo_box_get_active (GTK_COMBO_BOX(box));
float fkit = (float)new_kit;
if (ui->curKit >= 0 && ui->curKit != new_kit) {
int samples = ui->kits->kits[new_kit].samples;
if (ui->sample_table)
gtk_widget_destroy(GTK_WIDGET(ui->sample_table));
ui->sample_table = GTK_TABLE(gtk_table_new(1,1,true));
ui->curKit = new_kit;
if (ui->gain_sliders) free(ui->gain_sliders);
if (ui->pan_sliders) free(ui->pan_sliders);
ui->gain_sliders = malloc(samples*sizeof(GtkWidget*));
ui->pan_sliders = malloc(samples*sizeof(GtkWidget*));
fill_sample_table(ui,samples);
gtk_box_pack_start(GTK_BOX(ui->drmr_widget),GTK_WIDGET(ui->sample_table),
true,true,5);
gtk_box_reorder_child(GTK_BOX(ui->drmr_widget),GTK_WIDGET(ui->sample_table),0);
gtk_widget_show_all(GTK_WIDGET(ui->sample_table));
if (ui->curKit != new_kit)
ui->write(ui->controller,DRMR_KITNUM,4,0,&fkit);
}
}
static void fill_kit_combo(GtkComboBoxText* combo, kits* kits) {
static void fill_kit_combo(GtkComboBox* combo, kits* kits) {
int i;
for (i=0;i<kits->num_kits;i++)
gtk_combo_box_text_append_text(combo,kits->kits[i].name);
GtkTreeIter iter;
GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(combo));
for (i=0;i<kits->num_kits;i++) {
gtk_list_store_append (store, &iter);
gtk_list_store_set(store, &iter, 0, kits->kits[i].name, -1);
}
}
static void build_drmr_ui(DrMrUi* ui) {
GtkWidget *drmr_ui_widget;
GtkWidget *sample_table;
GtkWidget *kit_hbox, *kit_combo_box, *kit_label;
GtkCellRenderer *cell_rend;
drmr_ui_widget = gtk_vbox_new(false,0);
g_object_set(drmr_ui_widget,"border-width",6,NULL);
sample_table = gtk_table_new(1,1,true);
gtk_table_set_col_spacings(GTK_TABLE(sample_table),5);
gtk_table_set_row_spacings(GTK_TABLE(sample_table),5);
gtk_box_pack_start(GTK_BOX(drmr_ui_widget),sample_table,
true,true,5);
ui->kit_store = gtk_list_store_new(1,G_TYPE_STRING);
kit_hbox = gtk_hbox_new(false,0);
kit_combo_box = gtk_combo_box_text_new();
kit_combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(ui->kit_store));
kit_label = gtk_label_new("Kit:");
cell_rend = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(kit_combo_box), cell_rend, true);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(kit_combo_box), cell_rend,"text",0,NULL);
gtk_box_pack_start(GTK_BOX(kit_hbox),kit_label,
false,false,15);
gtk_box_pack_start(GTK_BOX(kit_hbox),kit_combo_box,
@@ -183,8 +166,9 @@ static void build_drmr_ui(DrMrUi* ui) {
false,false,5);
ui->drmr_widget = drmr_ui_widget;
ui->sample_table = GTK_TABLE(sample_table);
ui->kit_combo = GTK_COMBO_BOX_TEXT(kit_combo_box);
ui->sample_table = NULL;
ui->kit_combo = GTK_COMBO_BOX(kit_combo_box);
g_signal_connect(G_OBJECT(kit_combo_box),"changed",G_CALLBACK(kit_combobox_changed),ui);
@@ -206,10 +190,11 @@ instantiate(const LV2UI_Descriptor* descriptor,
ui->controller = controller;
ui->drmr_widget = NULL;
ui->curKit = -1;
ui->samples = 0;
*widget = NULL;
build_drmr_ui(ui);
ui->kits = scan_kits();
ui->gain_quark = g_quark_from_string("drmr_gain_quark");
ui->pan_quark = g_quark_from_string("drmr_pan_quark");
@@ -227,6 +212,8 @@ instantiate(const LV2UI_Descriptor* descriptor,
static void cleanup(LV2UI_Handle handle) {
DrMrUi* ui = (DrMrUi*)handle;
gtk_widget_destroy(ui->drmr_widget);
if (ui->gain_sliders) free(ui->gain_sliders);
if (ui->pan_sliders) free(ui->pan_sliders);
free(ui);
}
@@ -245,28 +232,52 @@ port_event(LV2UI_Handle handle,
else {
int kit = (int)(*((float*)buffer));
int samples = ui->kits->kits[kit].samples;
GtkWidget** gain_sliders;
GtkWidget** pan_sliders;
if (ui->sample_table) {
ui->gain_sliders = NULL;
ui->pan_sliders = NULL;
gtk_widget_destroy(GTK_WIDGET(ui->sample_table));
}
ui->sample_table = GTK_TABLE(gtk_table_new(1,1,true));
gtk_table_set_col_spacings(ui->sample_table,5);
gtk_table_set_row_spacings(ui->sample_table,5);
ui->curKit = kit;
ui->gain_sliders = malloc(samples*sizeof(GtkWidget*));
ui->pan_sliders = malloc(samples*sizeof(GtkWidget*));
fill_sample_table(ui,samples);
gtk_combo_box_set_active (GTK_COMBO_BOX(ui->kit_combo), kit);
if (ui->gain_sliders) free(ui->gain_sliders);
if (ui->pan_sliders) free(ui->pan_sliders);
gain_sliders = malloc(samples*sizeof(GtkWidget*));
pan_sliders = malloc(samples*sizeof(GtkWidget*));
fill_sample_table(ui,samples,gain_sliders,pan_sliders);
gtk_box_pack_start(GTK_BOX(ui->drmr_widget),GTK_WIDGET(ui->sample_table),
true,true,5);
gtk_box_reorder_child(GTK_BOX(ui->drmr_widget),GTK_WIDGET(ui->sample_table),0);
gtk_widget_show_all(GTK_WIDGET(ui->sample_table));
gtk_combo_box_set_active(ui->kit_combo,kit);
ui->samples = samples;
ui->gain_sliders = gain_sliders;
ui->pan_sliders = pan_sliders;
}
}
else if (index >= DRMR_GAIN_ONE &&
index <= DRMR_GAIN_SIXTEEN) {
index <= DRMR_GAIN_THIRTYTWO) {
if (ui->gain_sliders) {
float gain = *(float*)buffer;
GtkRange* range = GTK_RANGE(ui->gain_sliders[index-DRMR_GAIN_ONE]);
gtk_range_set_value(range,gain);
int idx = index-DRMR_GAIN_ONE;
if (idx < ui->samples) {
GtkRange* range = GTK_RANGE(ui->gain_sliders[idx]);
gtk_range_set_value(range,gain);
}
}
}
else if (index >= DRMR_PAN_ONE &&
index <= DRMR_PAN_SIXTEEN) {
index <= DRMR_PAN_THIRTYTWO) {
if (ui->pan_sliders) {
float pan = *(float*)buffer;
GtkRange* range = GTK_RANGE(ui->pan_sliders[index-DRMR_PAN_ONE]);
gtk_range_set_value(range,pan);
int idx = index-DRMR_PAN_ONE;
if (idx < ui->samples) {
GtkRange* range = GTK_RANGE(ui->pan_sliders[idx]);
gtk_range_set_value(range,pan);
}
}
}
}