summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_ops.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2005-10-27 01:10:36 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2005-10-27 01:10:36 +0000
commitc71fc0272da4196f4bc14060f2c6bddcce76f823 (patch)
tree5f20154d48f1119c59b81a68ab36cfd66c6f1ff0 /gtk2_ardour/editor_ops.cc
parenta0ee84a67358a7614cfa1b5e0df9af7e28072490 (diff)
option editor and some prompters, misc stuff. this commit message contains no apostrophes.
git-svn-id: svn://localhost/trunk/ardour2@69 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r--gtk2_ardour/editor_ops.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index b3d18f476b..5909bee1f8 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1469,7 +1469,7 @@ Editor::insert_region_list_drag (AudioRegion& region)
AudioTimeAxisView *atv = 0;
Playlist *playlist;
- track_canvas->get_pointer (x, y);
+ track_canvas.get_pointer (x, y);
gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wx, &wy);
@@ -2904,7 +2904,7 @@ Editor::freeze_route ()
interthread_progress_window->set_title (_("ardour: freeze"));
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_window->show_all ();
- interthread_progress_bar.set_percentage (0.0f);
+ interthread_progress_bar.set_fraction (0.0f);
interthread_progress_label.set_text ("");
interthread_cancel_label.set_text (_("Cancel Freeze"));
current_interthread_info = &itt;
@@ -2918,7 +2918,7 @@ Editor::freeze_route ()
pthread_create (&itt.thread, 0, _freeze_thread, this);
- track_canvas_scroller.get_window()->set_cursor (GDK_WATCH);
+ track_canvas_scroller.get_window()->set_cursor (Gdk::WATCH);
while (!itt.done && !itt.cancel) {
gtk_main_iteration ();
@@ -3070,7 +3070,7 @@ Editor::cut_copy_points (CutCopyOp op)
void
Editor::cut_copy_regions (CutCopyOp op)
{
- typedef map<AudioPlaylist*,AudioPlaylist*> PlaylistMapping;
+ typedef std::map<AudioPlaylist*,AudioPlaylist*> PlaylistMapping;
PlaylistMapping pmap;
jack_nframes_t first_position = max_frames;
set<Playlist*> freezelist;
@@ -3166,7 +3166,7 @@ Editor::mouse_paste ()
{
gint x, y;
double wx, wy;
- track_canvas->get_pointer (x, y);
+ track_canvas.get_pointer (x, y);
gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wx, &wy);