Changeset 463

Timestamp:

01/09/07 01:02:51 (2 years ago)

Author:

radekk

Message:

Redesign time marker handling.
Add register operation of time marker handling - in progress.

Files:

• sweep/branches/sweep-info-panel/src/edit.c (modified) (3 diffs)
• sweep/branches/sweep-info-panel/src/info-panel.c (modified) (4 diffs)
• sweep/branches/sweep-info-panel/src/interface.c (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/sample-display.c (modified) (17 diffs)
• sweep/branches/sweep-info-panel/src/samplerate.c (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/sweep_app.h (modified) (3 diffs)
• sweep/branches/sweep-info-panel/src/sweep_marker.c (modified) (10 diffs)
• sweep/branches/sweep-info-panel/src/sweep_sample.c (modified) (14 diffs)
• sweep/branches/sweep-info-panel/src/sweep_selection.c (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/sweep_sounddata.c (modified) (5 diffs)
• sweep/branches/sweep-info-panel/src/sweep_undo.c (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/undo_dialog.c (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/view.c (modified) (1 diff)

sweep/branches/sweep-info-panel/src/edit.c

@@ -405 +405 @@
-
-    sounddata_add_selection_1 (s->sounddata, er->start - start,
-
+, NULL
-
-#ifdef DEBUG
@@ -617 +617 @@
-    if (er->start > sounddata->nr_frames) break;
-
-
+, NULL
-  }
-}
@@ -1049 +1049 @@
-  /* Select the copied in portion of the sounddata */
-  sounddata_set_selection_1 (sounddata, paste_offset,
-
+, NULL
-
-  /* Move offset markers */

sweep/branches/sweep-info-panel/src/info-panel.c

@@ -51 +51 @@
- * - show/edit sample type (ogg, mp3, wav, etc.)
- * - treeview doesn't catch all keyboards signals, so editing cells is almost useless
+ *   - so temporary disabled accels
- * - implement:
- *   - changing sampling rate
@@ -61 +62 @@
-typedef struct _PopupData PopupData;
-typedef struct _SelectionData SelectionData;
+typedef struct _MarkerData MarkerData;
-
-struct _PopupData
@@ -72 +74 @@
-        sw_sel sel_data;
-        sw_sel * sel_modify;
+};
+
+struct _MarkerData
+{
+        sw_mark mark_data;
+        sw_mark * mark_modify;
-};
-
@@ -1291 +1299 @@
-#else
-
-void info_panel_add_markers_cb (GtkWidget * menuitem
+static sw_sample * info_panel_marker_add (sw_sample * s, sw_param_set unused
-{
-        sw_mark * mark;
-
-
+
+
+
-
-        view->sample->sounddata->marks = marks_add_marker (view->sample->sounddata->marks, mark);
-
+        g_mutex_unlock (s->sounddata->marks_mutex);
+        
-        sample_refresh_views (view->sample);
+
+        return s;
+}
+
+void info_panel_add_markers_cb (GtkWidget *menuitem, sw_view * view)
+{
+        perform_marker_op (view->sample, _("Add Time marker"), (SweepFilter)info_panel_marker_add, NULL, view);
-}
-#endif

sweep/branches/sweep-info-panel/src/interface.c

@@ -51 +51 @@
-GtkStyle * style_dark_grey;
-GtkStyle * style_red;
-
-
-
-
-

sweep/branches/sweep-info-panel/src/sample-display.c

@@ -35 +35 @@
-#include <gtk/gtk.h>
-
+#include <sweep/sweep_marker.h>
-#include <sweep/sweep_i18n.h>
-
@@ -45 +46 @@
-#include "edit.h"
-#include "undo_dialog.h"
+#include "info-panel.h"
-
-/*#define DEBUG*/
@@ -143 +145 @@
-  0, 0, 0,       /* tmp_sel_text */
-  255, 255, 255, /* sel_text */
-240, 240, 24
+0, 0, 
-};
-
@@ -170 +172 @@
-  0, 0, 0,       /* tmp_sel_text */
-  255, 255, 255, /* sel_text */
-240, 240, 240,
+0, 0, 0,     
-};
-#endif
@@ -286 +288 @@
-sample_display_get_mouse_offset (SampleDisplay * s)
-{
-
+g
-  GdkModifierType state;
-
@@ -421 +423 @@
-sample_display_refresh_sels (SampleDisplay * s)
-{
-
+g
-  sw_sample * sample;
-  GList * gl;
@@ -484 +486 @@
-sample_display_refresh_marks (SampleDisplay * s)
-{
-
+//
-  sw_sample * sample;
-  GList * gl;
@@ -1341 +1343 @@
-    /* draw the selection */
-    sample_display_draw_sel_box (win, s->sel_gc,
-                       
-                       
+
+
-
-    if ( sel->name != NULL ){
@@ -1450 +1452 @@
-
-            if ( mark->name != NULL ){
-fg
+mark_text
-                                x2 + 2, 0,
-                                layout);
-/*
-                        gtk_paint_layout (GTK_WIDGET(s)->style,
-                                        win, GTK_WIDGET_STATE (GTK_WIDGET(s)),
-                                FALSE, NULL,
-                                GTK_WIDGET(s), NULL,
-                                x2 + 2, 0,
-                                layout);
-*/
-            }
-    }
@@ -2118 +2112 @@
-}
-
+#if 0
+typedef struct _MarkerData MarkerData;
+struct _MarkerData
+{
+        sw_framecount_t offset;
+        sw_mark * mark_modify;
+};
+
+static void
+sample_display_mod_marker (sw_sample * s, sw_param_set unused, MarkerData * markdata)
+{
+  /* pointer into moving marker */
+  s->tmp_mark = markdata->mark_modify;
+
+  /* modify data */
+  s->tmp_mark->frame = markdata->offset;
+                        
+  g_free(markdata);
+}
+#endif
+
-static void
-sample_display_handle_marker_motion (SampleDisplay * s, int x, int y)
@@ -2123 +2138 @@
-  sw_mark * mark;
-  GList * gl;
+  sw_sample * sample = s->view->sample;
-  sw_framecount_t offset, off1, off2;
-  gboolean mod = FALSE;
+  //MarkerData * markdata;
-
-  offset = XPOS_TO_OFFSET(x);
@@ -2130 +2147 @@
-  off2 = XPOS_TO_OFFSET(x + 5);
-
-->view->s
-
-->view->s
-
-->view->s
+
+
+
+
+
-          mod = TRUE;
-
-  } else {
-->view->s
+
-        
-                mark = (sw_mark *)gl->data;
-
-                if ( (mark->frame >= off1) && (mark->frame <= off2) ){
+                        /* pointer into moving marker */
+                        sample->tmp_mark =  mark;
+
+                        /* modify data */
+                        mark->frame = offset;
+#if 0
+                        markdata = g_malloc0 ( sizeof (MarkerData) );
-                        
-
-
-
+
+
+
+
+
+
-                        mod = TRUE;
-                                                
-                        break;
-                }
@@ -2455 +2481 @@
-      case TOOL_MARKER:
-        s->selecting = SELECTING_MARKER;
-//      s->view->hand_offset = x;
-//      SET_CURSOR(widget, HAND_CLOSE);
-        sample_display_handle_marker_motion (s, x, y);
-        break;
@@ -2546 +2570 @@
-}
-
+static sw_sample * sample_display_marker_mod (sw_sample * s, sw_param_set unused, sw_view * view)
+{
+
+
+
+}
+
-static gint
-sample_display_button_release (GtkWidget      *widget,
@@ -2565 +2596 @@
-  case TOOL_SELECT:
-    
-
+
+
-     * sink this sample's temporary selection.
-     */
@@ -2579 +2611 @@
-    }
-    
-
+
+
-     * to that used for selection, then sink the appropriate temporary
-     * selection.
@@ -2602 +2635 @@
-    s->view->hand_offset = -1;
-    break;
+
-  case TOOL_MARKER:
-    s->view->sample->tmp_mark = NULL;
+    
+    s->view->sample->sounddata->marks = 
+            marks_resort(s->view->sample->sounddata->marks);
+    
+    perform_marker_op (s->view->sample, _("Modify Time marker"), (SweepFilter)sample_display_marker_mod, NULL, s->view);
+
+    info_panel_markers_info_update (s->view->sample);
+
-    break;
+
-  case TOOL_MOVE:
-    break;

sweep/branches/sweep-info-panel/src/samplerate.c

@@ -132 +132 @@
-
-    sounddata_add_selection_1 (new_sounddata, sel->sel_start * src_ratio,
-
+, NULL
-  }
-  g_mutex_unlock (sample->ops_mutex);

sweep/branches/sweep-info-panel/src/sweep_app.h

@@ -105 +105 @@
-  sw_framecount_t start, end; /* bounds of visible frames */
-  sw_audio_t vlow, vhigh; /* bounds of vertical zoom */
- gfloat gain;
-gfloat rate;
+gfloat gain; 
+ gfloat rate; 
-
-  sw_tool_t current_tool;
@@ -154 +154 @@
-  GtkObject * gain_adj;
-  GtkObject * rate_adj;
+
+  GtkAccelGroup * accel_group;
-
-  GtkWidget * db_rulers_vbox;
@@ -246 +248 @@
-  gpointer file_info; /* parameters of original file or last save */
-
-
+  
-  sw_mark * tmp_mark; /* Temp marker, used while moving */
-

sweep/branches/sweep-info-panel/src/sweep_marker.c

@@ -39 +39 @@
-#include "sample-display.h"
-#include "driver.h"
+#include "sweep_app.h"
+#include "undo_dialog.h"
-
-#define MARKER_IMG_NUMBER       11
@@ -122 +124 @@
-    return;
-
-
+
+
+
+
-  g_free( mark );
+}
+
+void
+marks_destroy (GList * marks)
+{
+  GList * gl;
+  sw_mark * mark;
+
+  for (gl = marks; gl; gl = gl->next){
+          mark = (sw_mark*)gl->data;
+          mark_free (mark);
+  }
+
+  g_list_free (marks);
-}
-
@@ -150 +169 @@
-          return 0;
-}
-
-#if 0
-static void
-dump_marks (GList * marks, char * desc)
-{
-#ifdef DEBUG
-  GList * gl;
-  sw_mark * mark;
-
-  printf ("<dump %s (%p)>\n", desc, marks);
-  for (gl = marks; gl; gl = gl->next) {
-    mark = (sw_mark *)gl->data;
-    printf ("\t[%ld - %ld]\n", mark->mark_start, mark->mark_end);
-  }
-  printf ("</dump>\n");
-#endif
-}
-#endif
-
-/*
@@ -196 +197 @@
-
-GList *
+marks_resort (GList * marks)
+{
+        return g_list_sort (marks, (GCompareFunc)mark_cmp);
+}
+
+GList *
-marks_add_marker_1 (GList * marks, sw_framecount_t frame, sw_mark_type_t type, gchar * name)
-{
@@ -230 +237 @@
-mark_replace_data_destroy (mark_replace_data * s)
-{
-
-
+
+
+
+
+
+
-}
-
@@ -237 +248 @@
-do_by_mark_replace (sw_sample * s, mark_replace_data * sr)
-{
-//  dump_marks (sr->marks, "at replace action");
-  sample_set_markers (s, sr->marks);
-
-  /*  sample_refresh_views (s);*/
-}
-
@@ -255 +263 @@
-  GList * marks;
-
+  /* marks, "copied for undo data" */
-  marks = marks_copy (sample->sounddata->marks);
-//  dump_marks (marks, "copied for undo data");
-  inst->undo_data = mark_replace_data_new (marks);
-  set_active_op (sample, inst);
@@ -263 +271 @@
-
-  if (sample->edit_state == SWEEP_EDIT_STATE_BUSY) {
+    /* marks, "copied for redo data" */
-    marks = marks_copy (sample->sounddata->marks);
-//    dump_marks (marks, "copied for redo data");
-    inst->redo_data = mark_replace_data_new (marks);
-
-    register_operation (sample, inst);
-  }
-
-#if 0
-  sample_set_edit_state (sample, SWEEP_EDIT_STATE_DONE);
-#endif
-}
-
@@ -286 +290 @@
-
-sw_op_instance *
-
+g
-                      sw_param_set pset, gpointer custom_data)
-{
@@ -299 +303 @@
-  return NULL;
-}
+
+/*
+ * function preform immediate operation, so no threading, no asynchronous
+ * operations, clean and easy.
+ */
+void
+perform_marker_immediate_op (sw_sample * sample, gchar * desc, SweepFilter func,
+                                sw_param_set pset, gpointer custom_data)
+{
+  sw_op_instance * inst;
+  GList * marks;
+
+  inst = sw_op_instance_new (sample, desc, &marker_op);
+  inst->do_data = custom_data;
+
+  /* marks, "copied for undo data" */
+  marks = marks_copy (sample->sounddata->marks);
+  inst->undo_data = mark_replace_data_new (marks);
+  set_active_op (sample, inst);
+
+  func (sample, pset, custom_data);
+
+  /* marks, "copied for redo data" */
+  marks = marks_copy (sample->sounddata->marks);
+  inst->redo_data = mark_replace_data_new (marks);
+
+  register_operation (sample, inst);
+
+  undo_dialog_refresh_history (sample);
+}
+

sweep/branches/sweep-info-panel/src/sweep_sample.c

@@ -1378 +1378 @@
-}
-
+void
+sample_clear_markers (sw_sample * s)
+{
+  sounddata_clear_markers (s->sounddata);
+}
+
-static void
-sample_normalise_selection (sw_sample * s)
@@ -1394 +1400 @@
-
-sw_sel *
-
-
-
+, gchar * name
+
+, name
-}
-
@@ -1408 +1414 @@
-
-sw_sel *
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-{
-  sel->sel_start = new_start;
-  sel->sel_end = new_end;
+  if (!name){
+          if (!sel->name)
+                  g_free(sel->name);
+
+          sel->name = g_strdup(name);
+  }
-
-  sample_normalise_selection (s);
@@ -1434 +1447 @@
-
-#if 0
+
-  sounddata->sels = sels_invert (sounddata->sels, sounddata->nr_frames);
-
@@ -1439 +1453 @@
-
-  if (!sounddata->sels) {
-
+, NULL
-    goto out;
-  }
@@ -1448 +1462 @@
-  sel = osel = (sw_sel *)gl->data;
-  if (osel->sel_start > 0) {
-
+, NULL
-  }
-
@@ -1455 +1469 @@
-  for (; gl; gl = gl->next) {
-    sel = (sw_sel *)gl->data;
-
+, NULL
-    osel = sel;
-  }
-
-  if (sel->sel_end != sounddata->nr_frames) {
-
-
-
+
+
+
+
-  g_list_free (osels);
-
@@ -1486 +1501 @@
-  g_mutex_lock (sounddata->sels_mutex);
-
-
+, NULL
-
-  g_mutex_unlock (sounddata->sels_mutex);
@@ -1703 +1718 @@
-  n += snprintf (buf+n, BUF_LEN-n, "]");
-*/
-
-
-
+
-
-  sel = sel_copy (s->tmp_sel);
@@ -1713 +1726 @@
-//  last_tmp_view = NULL;
-
-//  g_mutex_unlock (s->sounddata->sels_mutex);
-  
-  perform_selection_op (s, buf, ssits, NULL, sel);
-#undef BUF_LEN
@@ -1759 +1770 @@
-  n += snprintf (buf+n, BUF_LEN-n, "]");
-
-//  g_mutex_lock (s->sounddata->sels_mutex);
-
-  sel = sel_copy (s->tmp_sel);
-
@@ -1767 +1776 @@
-//  last_tmp_view = NULL;
-
-//  g_mutex_unlock (s->sounddata->sels_mutex);
-  
-  perform_selection_op (s, buf, sssts, NULL, sel);
-}
@@ -1806 +1813 @@
-  n += snprintf (buf+n, BUF_LEN-n, "]");
-*/
-       
+  
-
-  g_mutex_lock (s->sounddata->sels_mutex);
@@ -1818 +1825 @@
-
-  perform_selection_op (s, buf, ssrwts, NULL, sel);
-
-
+
+
-
-void
-sample_set_markers (sw_sample * s, GList * gl)
-{
-/*XXX: Implement 
- *
-  sample_clear_markers(s);
- */
-
-  s->sounddata->marks = marks_copy (gl);
-}
-
-
-/* Sample info dialog */

sweep/branches/sweep-info-panel/src/sweep_selection.c

@@ -63 +63 @@
-    return;
-
-
+
+
+
+
-  g_free(sel);
+}
+
+void
+sels_destroy (GList * sels)
+{
+  GList * gl;
+  sw_sel * sel;
+
+  for (gl = sels; gl; gl = gl->next){
+          sel = (sw_sel*)gl->data;
+          sel_free (sel); 
+  }
+
+  g_list_free (sels);
-}
-

sweep/branches/sweep-info-panel/src/sweep_sounddata.c

@@ -35 +35 @@
-#include <sweep/sweep_typeconvert.h>
-#include <sweep/sweep_selection.h>
+#include <sweep/sweep_selection.h>
+#include <sweep/sweep_marker.h>
-#include <sweep/sweep_undo.h>
-
@@ -102 +104 @@
-sounddata_clear_selection (sw_sounddata * sounddata)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  sounddata->sels = NULL;
+};
+
+void
+sounddata_clear_markers (sw_sounddata * sounddata)
+{
+/*
+  GList * gl;
+  sw_mark * mark;
+
+  for (gl = sounddata->marks; gl; gl = gl->next){
+          mark = (sw_mark*)gl->data;
+          mark_free (mark);
+  }
+
+  g_list_free (sounddata->marks);
+*/
+  marks_destroy (sounddata->marks);
+
+  sounddata->marks = NULL;
-};
-
@@ -247 +279 @@
-
-  /* Clear the old selection */
-g_list_free (sounddata->sels
+sounddata_clear_selection (sounddata
-
-  /* Set the newly created (normalised) selection */
@@ -257 +289 @@
-sounddata_add_selection (sw_sounddata * sounddata, sw_sel * sel)
-{
-
-
+ sels_add_selection (sounddata->sels, sel);
+//
-}
-
-sw_sel *
-
-
-
-
-NULL
+, gchar * name
+
+
+
+name
-
-  sounddata_add_selection(sounddata, sel);
@@ -274 +306 @@
-
-sw_sel *
-
+, gchar * name
-{
-  sounddata_clear_selection (sounddata);
-
-
+, name
-}
-

sweep/branches/sweep-info-panel/src/sweep_undo.c

@@ -173 +173 @@
-
-  if (sample->ops_thread == (pthread_t) -1) {
+/* TODO: GLib'ing threading */
-    pthread_create (&sample->ops_thread, NULL, (void *) (*op_main), sample);
-  }

sweep/branches/sweep-info-panel/src/undo_dialog.c

@@ -193 +193 @@
-undo_dialog_refresh_history (sw_sample * sample)
-{
-       
+  
-
-  if (sample != ud_sample)

sweep/branches/sweep-info-panel/src/view.c

@@ -2932 +2932 @@
-  view->menu = gtk_menu_new ();
-  accel_group = create_view_menu (view, view->menu);
-
-
+
+
+
+
+
+
+
+
+
-  create_view_menu (view, view->menubar);
-