diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-06-03 12:22:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-06-03 12:22:21 +0000 |
| commit | a29b3b862aaa7964d64a625eac9962bb6d0ff14f (patch) | |
| tree | f84a9d526ba320abc89fdb090fdd9b0aac2275eb /gtk2_ardour | |
| parent | 66016dfef77df2c5f6bcb0bc44ffd7cb38b83f87 (diff) | |
small changes to export code to hopefully fix some bugs with range export(s)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3441 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/export_range_markers_dialog.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/utils.cc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index b6bc69c9b9..5d46b06a07 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -974,6 +974,8 @@ ExportDialog::do_export () progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100); cancel_label.set_text (_("Stop Export")); + session->pre_export (); + export_audio_data(); progress_connection.disconnect (); @@ -1228,7 +1230,7 @@ ExportDialog::initSpec(string &filepath) { spec.path = filepath; spec.progress = 0; - spec.running = true; + spec.running = false; spec.stop = false; spec.port_map.clear(); diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc index 1184294a67..329493e195 100644 --- a/gtk2_ardour/export_range_markers_dialog.cc +++ b/gtk2_ardour/export_range_markers_dialog.cc @@ -81,8 +81,6 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList& spec.start_frame = currentLocation->start(); spec.end_frame = currentLocation->end(); - getSession().request_locate(spec.start_frame, false); - if (getSession().start_audio_export(spec)){ // if export fails return; @@ -100,6 +98,8 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList& } current_range_marker_index++; + + getSession().stop_audio_export (spec); } } diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index ae3d3947f7..6470b1c357 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -680,7 +680,7 @@ set_pango_fontsize () /* Cairo rendering, in case there is any */ - pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); + // pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); } void |