Fix ruler scale on initial view (apply patch from nick_m).

[ardour.git] / gtk2_ardour / export_range_markers_dialog.cc

diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc
index b6bd25a60d2993152041964e0a1137dcba1a43b4..8bb93eb4aa0214e8d19880be37f9e9e60fbad0ac 100644 (file)
--- a/gtk2_ardour/export_range_markers_dialog.cc
+++ b/gtk2_ardour/export_range_markers_dialog.cc
@@ -54,7 +54,7 @@ ExportRangeMarkersDialog::browse_action () const
 }
        
 void 
-ExportRangeMarkersDialog::export_audio_data ()
+ExportRangeMarkersDialog::export_data ()
 {
        getSession().locations()->apply(*this, &ExportRangeMarkersDialog::process_range_markers_export);
 }
@@ -65,7 +65,7 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList&
        Locations::LocationList::iterator locationIter;
        current_range_marker_index = 0;
        init_progress_computing(locations);
-       
+
        for (locationIter = locations.begin(); locationIter != locations.end(); ++locationIter) {
                Location *currentLocation = (*locationIter);
 
@@ -83,14 +83,15 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList&
 
                        getSession().request_locate(spec.start_frame, false);
 
-                       if (getSession().start_audio_export(spec)){
+                       if (getSession().start_export(spec)){
                                // if export fails                      
                                return;
                        }
 
                        // wait until export of this range finished
                        gtk_main_iteration();
-                       while(spec.running){
+
+                       while (spec.running){
                                if(gtk_events_pending()){
                                        gtk_main_iteration();
                                }else {
@@ -197,12 +198,6 @@ ExportRangeMarkersDialog::progress_timeout ()
 {
        double progress = 0.0;
 
-       cerr << "Progress timeout, total = " << total_duration << " index = " << current_range_marker_index
-            << " current = " << range_markers_durations[current_range_marker_index]
-            << " agg = " << range_markers_durations_aggregated[current_range_marker_index]
-            << " prog = " << spec.progress
-            << endl;
-       
        if (current_range_marker_index >= range_markers_durations.size()){
                progress = 1.0;
        } else{