Changeset 474

Timestamp:

01/23/07 00:45:23 (2 years ago)

Author:

radekk

Message:

Marker scrolling doesn't work now. Still working on it.

Files:

• sweep/branches/sweep-info-panel/src/info-panel.c (modified) (8 diffs)
• sweep/branches/sweep-info-panel/src/sample-display.c (modified) (9 diffs)
• sweep/branches/sweep-info-panel/src/sample-display.h (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/view.c (modified) (2 diffs)

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

@@ -2026 +2026 @@
-#endif
-
-
+
+
-    return;
+  }
-
-  model = view->sample->info_panel->sample;
@@ -2064 +2066 @@
-          if (ssec <= 0)
-            {
-
-                                      _("Invalid time specification...")
+ _("Invalid time specification..."));
+              gtk_window_add_accel_group (GTK_WINDOW(view->window), view->accel_group
-              return;
-            }
@@ -2177 +2179 @@
-
-    }
+
+  gtk_window_add_accel_group (GTK_WINDOW(view->window), view->accel_group);
+
-}
-
@@ -2592 +2597 @@
-}
-
+void
+info_panel_edit_started_cb (GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path, sw_view * view)
+{
+
+  g_print("EDIT - STARTED\n");
+
+  gtk_window_remove_accel_group (GTK_WINDOW(view->window), view->accel_group);
+}
+
-static GtkWidget *
-info_panel_create_sample_view (sw_view * view)
@@ -2631 +2645 @@
-                                      INFO_PANEL_SAMPLE_COL_EDITABLE_VALUE);
-
-
-                   (GCallback) info_panel_sample_edited_value
+ (GCallback) info_panel_sample_edited_value_cb, view);
+  g_signal_connect(renderer, "editing-started", (GCallback) info_panel_edit_started
-
-  return treeview;
@@ -2669 +2683 @@
-  gtk_tree_view_column_add_attribute (col, renderer, "editable",
-                                      INFO_PANEL_SELECTIONS_COL_EDITABLE_NAME);
-
-                   (GCallback) info_panel_selections_edited_name
+ (GCallback) info_panel_selections_edited_name_cb, view);
+  g_signal_connect (renderer, "editing-started", (GCallback) info_panel_edit_started
-
-  renderer = gtk_cell_renderer_text_new ();
@@ -2679 +2693 @@
-                                      INFO_PANEL_SELECTIONS_COL_EDITABLE_VALUE);
-
-
-
-
-
+
+
+
-
-  return treeview;
@@ -2780 +2793 @@
-                                      INFO_PANEL_MARKERS_COL_EDITABLE_VALUE);
-
-
-
-
-
+
+
+
-
-  return treeview;

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

@@ -2006 +2006 @@
-   * new_win_start); 
-   */
-8
-
-s->hand_scroll_delta != 0
+5
+
+ abs (s->hand_scroll_delta) >= 1 
-}
-
@@ -2029 +2029 @@
-    }
-
-
+
+
-
-  return (new_win_start > 0);
@@ -2052 +2053 @@
-    }
-
-
+
+
-
-  return (new_win_start >= (s->view->end - win_length));
@@ -2238 +2240 @@
-    offset_xpos = OFFSET_TO_XPOS (sample->user_offset);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    new_win_start =
-    s->selecting_wins0 + (s->selecting_x0 - x) * vlen / s->width;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    new_win_start = CLAMP (new_win_start, 0,
-                           sample->sounddata->nr_frames - vlen);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    new_offset = new_win_start + offset_xpos * vlen / s->width;
@@ -2450 +2298 @@
-
-static void
-  
+
-{
-  gdouble move, vstart, vend;
@@ -2507 +2355 @@
-
-static void
-  
+
-{
-  sw_mark *mark;
@@ -2514 +2362 @@
-  sw_framecount_t offset, off1, off2;
-  gboolean mod = FALSE;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  if (sample->tmp_mark)
-  
+
-
-      sample->tmp_mark->frame = offset;
-      mod = TRUE;
-
-
-
-
+
-      for (gl = sample->sounddata->marks; gl; gl = gl->next)
-        {
@@ -2552 +2408 @@
-               */
-              mark->frame = offset;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-              break;
-            }
@@ -2574 +2417 @@
-
-  g_mutex_unlock (s->view->sample->sounddata->marks_mutex);
+
+  if (scroll_left && s->scroll_left_tag == 0){
+
+    if (s->scroll_right_tag != 0){
+
+      g_source_remove (s->scroll_right_tag);
+      s->scroll_right_tag = 0;
+
+    }
+
+    g_print ("Scroll left\n");
+
+    s->scroll_left_tag = g_timeout_add (100, sample_display_scroll_left, (gpointer) s);
+
+  }
+  else
+
+  if (scroll_right && s->scroll_right_tag == 0){
+  
+    if (s->scroll_left_tag != 0){
+  
+      g_source_remove (s->scroll_left_tag);
+      s->scroll_left_tag = 0;
+  
+    }
+  
+    g_print ("Scroll right\n");
+
+    s->scroll_right_tag = g_timeout_add (100, sample_display_scroll_right, (gpointer) s);
+  
+  }
+  else
+  
+  if (!scroll_right && !scroll_left){
+  
+    if (s->scroll_right_tag != 0){
+  
+      g_source_remove (s->scroll_right_tag);
+      s->scroll_right_tag = 0;
+  
+    }
+
+    if (s->scroll_left_tag != 0){
+  
+      g_source_remove (s->scroll_left_tag);
+      s->scroll_left_tag = 0;
+  
+    }
+  }
-
-  if (mod)

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

@@ -111 +111 @@
-  gint hand_scroll_tag;         /* gtk_timeout tag for natural
-                                 * hand scrolling */
-in
+floa
-
-  /*

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

@@ -1193 +1193 @@
-   ** and is quite a bit neater than the old stuff.
-   */
-// 
+
-
-
@@ -3160 +3160 @@
-   * implement my own
-   *
-
-
-
-
+
+
+
+
+
+
+
+
+
-  create_view_menu (view, view->menubar);
-