diff -rNu melys-0.1.7/ChangeLog melys-0.1.8/ChangeLog --- melys-0.1.7/ChangeLog Mon Nov 29 10:46:57 1999 +++ melys-0.1.8/ChangeLog Mon Nov 29 22:01:43 1999 @@ -1,5 +1,30 @@ 1999-11-29 Steve Ratcliffe + * md/mdutil.m: Removed dataset_destroy, which I am not convinced should + be there when clearing a selection. Caused problems when + double clicking on a part. + + * widgets/melystrackdisplay.m, widgets/melysview.m: + Fix crash on double click on a note. + The actions that are meant to operate on all selected parts + now do. + + * widgets/melyspiano.m, widgets/melystempo.m, + widgets/melystrackdisplay.m, widgets/melysview.m: + Editing back to normal. Can drag and drop between views + again with proper highlighting. Can double click to get + property box again on part display. + + * version: Version 0.1.7 + + * widgets/melysscroll.m, widgets/melystrack.m, + widgets/melystrackdisplay.m, widgets/melysview.m: + Re-wrote melys_track_display to be based on melys_view. + All the views are now based on melys_view. Adding key accelerators + can now be done on melys_view and will work for all views. + + * version: Version 0.1.6 + * ChangeLog: For release 0.1.6 * make.conf: Undid temporary changes * config/ports.m: diff -rNu melys-0.1.7/include/melysview.h melys-0.1.8/include/melysview.h --- melys-0.1.7/include/melysview.h Mon Nov 29 15:34:44 1999 +++ melys-0.1.8/include/melysview.h Mon Nov 29 22:02:07 1999 @@ -44,14 +44,12 @@ struct _MelysView { GtkVBox vbox; + int type; /* View type what is being displayed */ + ViewControl *vcp; GtkAdjustment *posadj; /* Song position adjustment */ - /* Amount of vertical scrolling, in things (you never see half a thing) */ - int voffset; - /* Horizontal offset, in ticks */ - int hoffset; /* Play position offset, in ticks */ int poffset; @@ -100,9 +98,13 @@ /* Signals */ void (*scale_changed)(MelysView *); + /* Mouse moved */ void (*thing_position)(MelysView *, int); void (*tick_position)(MelysView *, int); + + /* Action on button 1 double click */ + void (*button1_double)(MelysView *, struct element *); /* Method to get the base containing element */ struct containerElement *(*get_base_from_pos)(MelysView *, int thing); diff -rNu melys-0.1.7/md/mdutil.c melys-0.1.8/md/mdutil.c --- melys-0.1.7/md/mdutil.c Mon Nov 29 15:34:59 1999 +++ melys-0.1.8/md/mdutil.c Mon Nov 29 22:02:22 1999 @@ -382,10 +382,8 @@ int n; struct element *el; - if (MD_TYPE(base) == type && MD_SELECTED(base)) { + if (MD_TYPE(base) == type && MD_SELECTED(base)) MD_SET_SELECTED(base, FALSE); - g_dataset_destroy(base); - } if (iscontainer(base)) { for (n = 0; n < MD_CONTAINER_LEN(base); n++) { diff -rNu melys-0.1.7/md/mdutil.m melys-0.1.8/md/mdutil.m --- melys-0.1.7/md/mdutil.m Sat Nov 27 11:50:52 1999 +++ melys-0.1.8/md/mdutil.m Mon Nov 29 21:57:57 1999 @@ -491,10 +491,8 @@ int n; struct element *el; - if (MD_TYPE(base) == type && MD_SELECTED(base)) { + if (MD_TYPE(base) == type && MD_SELECTED(base)) MD_SET_SELECTED(base, FALSE); - g_dataset_destroy(base); - } if (iscontainer(base)) { for (n = 0; n < MD_CONTAINER_LEN(base); n++) { diff -rNu melys-0.1.7/version melys-0.1.8/version --- melys-0.1.7/version Mon Nov 29 15:34:14 1999 +++ melys-0.1.8/version Mon Nov 29 22:01:53 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.7" +#define MELYS_VERSION_STRING "0.1.8" diff -rNu melys-0.1.7/widgets/melyspiano.c melys-0.1.8/widgets/melyspiano.c --- melys-0.1.7/widgets/melyspiano.c Mon Nov 29 15:35:02 1999 +++ melys-0.1.8/widgets/melyspiano.c Mon Nov 29 22:02:25 1999 @@ -134,6 +134,7 @@ GtkWidget *mkeys; GtkWidget *invis; + mview->type = MD_TYPE_NOTE; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); view_control_set_limits(mview->vcp, 1, 0, 4, 0); @@ -431,6 +432,7 @@ el = MD_GET_INDEX(elem, n); MD_REF(el); md_remove(el->con, el); + n--; if (MD_TYPE(el) == MD_TYPE_NOTE) drop_elem(mview, el, note_to_thing(MD_NOTE(el)->note)); MD_UNREF(el); diff -rNu melys-0.1.7/widgets/melyspiano.m melys-0.1.8/widgets/melyspiano.m --- melys-0.1.7/widgets/melyspiano.m Mon Nov 29 01:22:23 1999 +++ melys-0.1.8/widgets/melyspiano.m Mon Nov 29 21:36:48 1999 @@ -100,6 +100,7 @@ GtkWidget *mkeys; GtkWidget *invis; + mview->type = MD_TYPE_NOTE; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); view_control_set_limits(mview->vcp, 1, 0, 4, 0); @@ -419,6 +420,7 @@ el = MD_GET_INDEX(elem, n); MD_REF(el); md_remove(el->con, el); + n--; if (MD_TYPE(el) == MD_TYPE_NOTE) drop_elem(mview, el, note_to_thing(MD_NOTE(el)->note)); MD_UNREF(el); diff -rNu melys-0.1.7/widgets/melystempo.c melys-0.1.8/widgets/melystempo.c --- melys-0.1.7/widgets/melystempo.c Mon Nov 29 15:35:03 1999 +++ melys-0.1.8/widgets/melystempo.c Mon Nov 29 22:02:26 1999 @@ -148,6 +148,8 @@ GtkWidget *frame1; GtkWidget *frame2; + mview->type = MD_TYPE_TEMPO; + mview->vcp->vspace = 0; /* No separation between items on scale */ MELYS_SCROLL(mview->canvas)->hbase = 5; MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ diff -rNu melys-0.1.7/widgets/melystempo.m melys-0.1.8/widgets/melystempo.m --- melys-0.1.7/widgets/melystempo.m Mon Nov 29 08:56:51 1999 +++ melys-0.1.8/widgets/melystempo.m Mon Nov 29 21:36:48 1999 @@ -119,6 +119,8 @@ GtkWidget *frame1; GtkWidget *frame2; + mview->type = MD_TYPE_TEMPO; + mview->vcp->vspace = 0; /* No separation between items on scale */ MELYS_SCROLL(mview->canvas)->hbase = 5; MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ diff -rNu melys-0.1.7/widgets/melystrackdisplay.c melys-0.1.8/widgets/melystrackdisplay.c --- melys-0.1.7/widgets/melystrackdisplay.c Mon Nov 29 15:35:04 1999 +++ melys-0.1.8/widgets/melystrackdisplay.c Mon Nov 29 22:02:27 1999 @@ -120,6 +120,7 @@ static void piano_cb(GtkWidget *w, gpointer data); static void part_prop_cb(GtkWidget *w, gpointer data); static struct containerElement *disp_get_base(MelysView *mview, int nthing); +static void disp_button1_double(MelysView *mview, struct element *elem); static int disp_get_nthing(MelysView *mview, struct element *elem); static gboolean disp_drop_elem(MelysView *mview, struct element *elem, int nthing); @@ -218,6 +219,8 @@ box = gtk_vbox_new(0, 0); + mview->type = MD_TYPE_PART; + /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); @@ -260,6 +263,7 @@ widget_class->draw = display_draw; view_class->scale_changed = disp_scale_changed; + view_class->button1_double = disp_button1_double; view_class->get_nthing = disp_get_nthing; view_class->drop_elem = disp_drop_elem; view_class->get_base_from_pos = disp_get_base; @@ -606,8 +610,9 @@ GSList *sellist; GSList *li; - sellist = md_build_sel(NULL, MD_ELEMENT(track), MD_TYPE_PART); - sellist = md_build_sel(sellist, MD_ELEMENT(track), MD_TYPE_PARTREF); + sellist = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), MD_TYPE_PART); + sellist = md_build_sel(sellist, MD_ELEMENT(mview->viewcon), + MD_TYPE_PARTREF); li = sellist; while (li) { @@ -664,6 +669,12 @@ return MD_CONTAINER(track); } +static void +disp_button1_double(MelysView *mview, struct element *elem) +{ + part_prop_box(MD_PART(elem), mview->song, 0); +} + static int disp_get_nthing(MelysView *mview, struct element *elem) { @@ -689,10 +700,17 @@ root = MD_ROOT(mview->viewcon); + md_ensure_track(root, nthing); + track = md_track_nth(MD_ROOT(mview->viewcon), nthing); + md_set_devchan(elem, MD_DEVCHAN(track)); + if (MD_TYPE(elem) == MD_TYPE_PART) { - md_ensure_track(root, nthing); - track = md_track_nth(MD_ROOT(mview->viewcon), nthing); md_add_sort(MD_CONTAINER(track), elem); + } else if (MD_TYPE(elem) == MD_TYPE_NOTE) { + /* Make sure that parts exist. This leads to bitty parts XXX */ + md_ensure_parts(MD_CONTAINER(track), + MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); + merge_in_elem(MD_CONTAINER(track), elem); } else return FALSE; diff -rNu melys-0.1.7/widgets/melystrackdisplay.m melys-0.1.8/widgets/melystrackdisplay.m --- melys-0.1.7/widgets/melystrackdisplay.m Mon Nov 29 15:31:55 1999 +++ melys-0.1.8/widgets/melystrackdisplay.m Mon Nov 29 21:56:45 1999 @@ -188,6 +188,8 @@ box = gtk_vbox_new(0, 0); + mview->type = MD_TYPE_PART; + /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); @@ -229,6 +231,7 @@ widget_class->draw = display_draw; view_class->scale_changed = disp_scale_changed; + view_class->button1_double = disp_button1_double; view_class->get_nthing = disp_get_nthing; view_class->drop_elem = disp_drop_elem; view_class->get_base_from_pos = disp_get_base; @@ -597,8 +600,9 @@ GSList *sellist; GSList *li; - sellist = md_build_sel(NULL, MD_ELEMENT(track), MD_TYPE_PART); - sellist = md_build_sel(sellist, MD_ELEMENT(track), MD_TYPE_PARTREF); + sellist = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), MD_TYPE_PART); + sellist = md_build_sel(sellist, MD_ELEMENT(mview->viewcon), + MD_TYPE_PARTREF); li = sellist; while (li) { @@ -665,6 +669,15 @@ return MD_CONTAINER(track); +>>function disp_button1_double +static void +MelysView *mview; +struct element *elem; + +>>code + part_prop_box(MD_PART(elem), mview->song, 0); + + >># --- The drag and drop routines --- >>function disp_get_nthing @@ -699,10 +712,17 @@ root = MD_ROOT(mview->viewcon); + md_ensure_track(root, nthing); + track = md_track_nth(MD_ROOT(mview->viewcon), nthing); + md_set_devchan(elem, MD_DEVCHAN(track)); + if (MD_TYPE(elem) == MD_TYPE_PART) { - md_ensure_track(root, nthing); - track = md_track_nth(MD_ROOT(mview->viewcon), nthing); md_add_sort(MD_CONTAINER(track), elem); + } else if (MD_TYPE(elem) == MD_TYPE_NOTE) { + /* Make sure that parts exist. This leads to bitty parts XXX */ + md_ensure_parts(MD_CONTAINER(track), + MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); + merge_in_elem(MD_CONTAINER(track), elem); } else return FALSE; diff -rNu melys-0.1.7/widgets/melysview.c melys-0.1.8/widgets/melysview.c --- melys-0.1.7/widgets/melysview.c Mon Nov 29 15:35:05 1999 +++ melys-0.1.8/widgets/melysview.c Mon Nov 29 22:02:28 1999 @@ -134,6 +134,7 @@ gpointer user_data); static struct containerElement *view_def_get_base(MelysView *mview, int thing); static gboolean view_def_drop(MelysView *mview, struct element *el, int thing); +static double get_squeeze_factor(int target, int droptype); static GtkVBoxClass *parent_class = NULL; @@ -178,10 +179,8 @@ GnomeCanvas *canvas; mview->vcp = view_control_new(); - mview->voffset = 0; - mview->hoffset = 0; mview->poffset = 0; - mview->vthings = 0; + mview->vthings = -1; mview->viewcon = NULL; mview->song = NULL; @@ -292,6 +291,7 @@ widget_class->draw = view_draw; klass->scale_changed = view_scale_changed; + klass->button1_double = NULL; klass->get_base_from_pos = view_def_get_base; klass->drop_elem = view_def_drop; klass->get_nthing = NULL; @@ -490,7 +490,8 @@ break; case GDK_2BUTTON_PRESS: - //part_prop_box(part, mview->song, 0); + if (VIEW_CLASS(mview)->button1_double) + VIEW_CLASS(mview)->button1_double(mview, elem); break; case GDK_BUTTON_RELEASE: @@ -688,6 +689,7 @@ MelysView *mview = MELYS_VIEW(data); GtkAdjustment *hadj; ticktime_t t; + int hoff; int x; hadj = mview->vcp->hadj; @@ -731,12 +733,13 @@ GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; - if (t - mview->hoffset > (ticktime_t)page_width - boundry && - t - mview->hoffset <= (ticktime_t)page_width) { + hoff = MELYS_SCROLL(mview->canvas)->hoffset; + if (t - hoff > (ticktime_t)page_width - boundry && + t - hoff <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; - set_scrolls(mview); + set_hscroll(mview); } /* @@ -767,7 +770,7 @@ ViewControl *vcp; /* You need to set vthings */ - g_return_if_fail(mview->vthings != 0); + g_return_if_fail(mview->vthings >= 0); if (!GTK_WIDGET_REALIZED(mview)) return; @@ -781,6 +784,8 @@ set_vscroll(mview); height = mview->vcp->vadj->upper * mview->vcp->vscale; + if (height < GTK_WIDGET(mview->canvas)->allocation.height) + height = GTK_WIDGET(mview->canvas)->allocation.height; points = mview->points; points->coords[0] = 0.0; @@ -838,7 +843,7 @@ * was clicked. */ if (MD_SELECTED(clickelem)) { - list = md_build_sel(NULL, MD_ELEMENT(mview->click_base), + list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), MD_TYPE(clickelem)); len = g_slist_length(list); } else { @@ -933,10 +938,11 @@ struct outline_data *oldata; struct drag_element_data *dragdata; struct drag_element_data *dp; + double squeeze; long tick_offset; int thing_offset; - int i; int len; + int i; srcw = gtk_drag_get_source_widget(context); if (srcw == NULL) { @@ -977,6 +983,9 @@ oldata->xoffset = tick_to_x(mview, tick_offset); oldata->yoffset = thing_to_y(mview, thing_offset); + squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); + oldata->yoffset *= squeeze; + /* * Create the individual outlines for each part that is being * moved. @@ -985,14 +994,16 @@ int x1, y1; dp = dragdata + i; + + x1 = tick_to_x(mview, dp->tick_offset - tick_offset); y1 = thing_to_y(mview, dp->thing_offset - thing_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, - "y1", (double) y1, + "y1", (double) y1 * squeeze, "x2", (double) x1 + tick_to_x(mview, dp->tick_len), - "y2", (double) y1 + mview->vcp->vheight, + "y2", (double) (y1 + mview->vcp->vheight) * squeeze, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1115,6 +1126,7 @@ gboolean needrm = FALSE; int x, y; double dx, dy; + double squeeze; int len; int res; int i; @@ -1134,10 +1146,13 @@ drop_thing = y_to_thing(mview, y); drop_tick = x_to_tick(mview, x); - len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; + squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); + if (squeeze == 0) + goto error; + /* * Do a first pass through the elements. We must either do * them all or do none of them. If the user has droped a set @@ -1149,8 +1164,8 @@ dp = dragdata+i; /* Check and adjust for droping before the beginning */ - if (dp->thing_offset + drop_thing < 0) - thing_start = MIN(thing_start, dp->thing_offset + drop_thing); + if (squeeze * dp->thing_offset + drop_thing < 0) + thing_start = MIN(thing_start, squeeze*dp->thing_offset+drop_thing); /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) @@ -1158,7 +1173,6 @@ minoff = MIN(minoff, dp->tick_offset); } - drop_tick -= tick_start; snapadj = md_snap_tick(mview->tempomap, minoff + drop_tick, mview->snap) @@ -1168,8 +1182,10 @@ for (i = 0; i < len; i++) { int tn; + int toff; dp = dragdata + i; + toff = dp->thing_offset * squeeze; switch (context->action) { case GDK_ACTION_MOVE: @@ -1192,7 +1208,7 @@ g_assert_not_reached(); } - tn = drop_thing + dp->thing_offset - thing_start; + tn = drop_thing + toff - thing_start; t = snapadj + drop_tick + dp->tick_offset; g_assert(t >= 0); @@ -1272,4 +1288,44 @@ return TRUE; +} + +static double +get_squeeze_factor(int target, int droptype) +{ + switch (target) { + case MD_TYPE_TEMPO: + switch (droptype) { + case MD_TYPE_TEMPO: + return 1; + case MD_TYPE_PART: + return 0; + case MD_TYPE_NOTE: + return 0; + } + break; + case MD_TYPE_PART: + switch (droptype) { + case MD_TYPE_TEMPO: + return 0; + case MD_TYPE_PART: + return 1; + case MD_TYPE_NOTE: + return 1.0/128; + } + break; + case MD_TYPE_NOTE: + switch (droptype) { + case MD_TYPE_TEMPO: + return 0; + case MD_TYPE_PART: + return 128.0; + case MD_TYPE_NOTE: + return 1; + } + break; + } + + g_warning("get_squeeze_factor case %d/%d not implemented", target, droptype); + return 0; } diff -rNu melys-0.1.7/widgets/melysview.m melys-0.1.8/widgets/melysview.m --- melys-0.1.7/widgets/melysview.m Mon Nov 29 15:31:55 1999 +++ melys-0.1.8/widgets/melysview.m Mon Nov 29 21:56:45 1999 @@ -59,14 +59,12 @@ struct _MelysView { GtkVBox vbox; + int type; /* View type what is being displayed */ + ViewControl *vcp; GtkAdjustment *posadj; /* Song position adjustment */ - /* Amount of vertical scrolling, in things (you never see half a thing) */ - int voffset; - /* Horizontal offset, in ticks */ - int hoffset; /* Play position offset, in ticks */ int poffset; @@ -115,10 +113,14 @@ /* Signals */ void (*scale_changed)(MelysView *); + /* Mouse moved */ void (*thing_position)(MelysView *, int); void (*tick_position)(MelysView *, int); + /* Action on button 1 double click */ + void (*button1_double)(MelysView *, struct element *); + /* Method to get the base containing element */ struct containerElement *(*get_base_from_pos)(MelysView *, int thing); @@ -234,10 +236,8 @@ GnomeCanvas *canvas; mview->vcp = view_control_new(); - mview->voffset = 0; - mview->hoffset = 0; mview->poffset = 0; - mview->vthings = 0; + mview->vthings = -1; mview->viewcon = NULL; mview->song = NULL; @@ -348,6 +348,7 @@ widget_class->draw = view_draw; klass->scale_changed = view_scale_changed; + klass->button1_double = NULL; klass->get_base_from_pos = view_def_get_base; klass->drop_elem = view_def_drop; klass->get_nthing = NULL; @@ -554,7 +555,8 @@ break; case GDK_2BUTTON_PRESS: - //part_prop_box(part, mview->song, 0); + if (VIEW_CLASS(mview)->button1_double) + VIEW_CLASS(mview)->button1_double(mview, elem); break; case GDK_BUTTON_RELEASE: @@ -768,6 +770,7 @@ MelysView *mview = MELYS_VIEW(data); GtkAdjustment *hadj; ticktime_t t; + int hoff; int x; hadj = mview->vcp->hadj; @@ -811,12 +814,13 @@ GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; - if (t - mview->hoffset > (ticktime_t)page_width - boundry && - t - mview->hoffset <= (ticktime_t)page_width) { + hoff = MELYS_SCROLL(mview->canvas)->hoffset; + if (t - hoff > (ticktime_t)page_width - boundry && + t - hoff <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; - set_scrolls(mview); + set_hscroll(mview); } /* @@ -851,7 +855,7 @@ ViewControl *vcp; /* You need to set vthings */ - g_return_if_fail(mview->vthings != 0); + g_return_if_fail(mview->vthings >= 0); if (!GTK_WIDGET_REALIZED(mview)) return; @@ -865,6 +869,8 @@ set_vscroll(mview); height = mview->vcp->vadj->upper * mview->vcp->vscale; + if (height < GTK_WIDGET(mview->canvas)->allocation.height) + height = GTK_WIDGET(mview->canvas)->allocation.height; points = mview->points; points->coords[0] = 0.0; @@ -929,7 +935,7 @@ * was clicked. */ if (MD_SELECTED(clickelem)) { - list = md_build_sel(NULL, MD_ELEMENT(mview->click_base), + list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), MD_TYPE(clickelem)); len = g_slist_length(list); } else { @@ -1034,10 +1040,11 @@ struct outline_data *oldata; struct drag_element_data *dragdata; struct drag_element_data *dp; + double squeeze; long tick_offset; int thing_offset; - int i; int len; + int i; srcw = gtk_drag_get_source_widget(context); if (srcw == NULL) { @@ -1078,6 +1085,9 @@ oldata->xoffset = tick_to_x(mview, tick_offset); oldata->yoffset = thing_to_y(mview, thing_offset); + squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); + oldata->yoffset *= squeeze; + /* * Create the individual outlines for each part that is being * moved. @@ -1086,14 +1096,16 @@ int x1, y1; dp = dragdata + i; + + x1 = tick_to_x(mview, dp->tick_offset - tick_offset); y1 = thing_to_y(mview, dp->thing_offset - thing_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, - "y1", (double) y1, + "y1", (double) y1 * squeeze, "x2", (double) x1 + tick_to_x(mview, dp->tick_len), - "y2", (double) y1 + mview->vcp->vheight, + "y2", (double) (y1 + mview->vcp->vheight) * squeeze, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1219,6 +1231,7 @@ gboolean needrm = FALSE; int x, y; double dx, dy; + double squeeze; int len; int res; int i; @@ -1238,10 +1251,13 @@ drop_thing = y_to_thing(mview, y); drop_tick = x_to_tick(mview, x); - len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; + squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); + if (squeeze == 0) + goto error; + /* * Do a first pass through the elements. We must either do * them all or do none of them. If the user has droped a set @@ -1253,8 +1269,8 @@ dp = dragdata+i; /* Check and adjust for droping before the beginning */ - if (dp->thing_offset + drop_thing < 0) - thing_start = MIN(thing_start, dp->thing_offset + drop_thing); + if (squeeze * dp->thing_offset + drop_thing < 0) + thing_start = MIN(thing_start, squeeze*dp->thing_offset+drop_thing); /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) @@ -1262,7 +1278,6 @@ minoff = MIN(minoff, dp->tick_offset); } - drop_tick -= tick_start; snapadj = md_snap_tick(mview->tempomap, minoff + drop_tick, mview->snap) @@ -1272,8 +1287,10 @@ for (i = 0; i < len; i++) { int tn; + int toff; dp = dragdata + i; + toff = dp->thing_offset * squeeze; switch (context->action) { case GDK_ACTION_MOVE: @@ -1296,7 +1313,7 @@ g_assert_not_reached(); } - tn = drop_thing + dp->thing_offset - thing_start; + tn = drop_thing + toff - thing_start; t = snapadj + drop_tick + dp->tick_offset; g_assert(t >= 0); @@ -1391,3 +1408,44 @@ return TRUE; +>>function get_squeeze_factor +static double +int target; The type of the target view +int droptype; The type being dropped + +>>code + switch (target) { + case MD_TYPE_TEMPO: + switch (droptype) { + case MD_TYPE_TEMPO: + return 1; + case MD_TYPE_PART: + return 0; + case MD_TYPE_NOTE: + return 0; + } + break; + case MD_TYPE_PART: + switch (droptype) { + case MD_TYPE_TEMPO: + return 0; + case MD_TYPE_PART: + return 1; + case MD_TYPE_NOTE: + return 1.0/128; + } + break; + case MD_TYPE_NOTE: + switch (droptype) { + case MD_TYPE_TEMPO: + return 0; + case MD_TYPE_PART: + return 128.0; + case MD_TYPE_NOTE: + return 1; + } + break; + } + + g_warning("@func_name case %d/%d not implemented", target, droptype); + return 0;