summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-09-21 02:29:08 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-09-21 02:29:08 +0000
commit42d8e5ddc107675c19a95ed3d68e3d8219629e10 (patch)
tree4aa62ccd111f2423fa4267169a3b5eb63b93584c
parent7ec428ca5685f59bf9528a8aafcc2c7af79b9e76 (diff)
fix error in export range dialog caused by using wrong sndfile helper array for file ending
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10103 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/export_dialog.h3
-rw-r--r--gtk2_ardour/export_range_markers_dialog.cc2
2 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 9a15f441e0..c1faa37fee 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -89,8 +89,7 @@ class ExportDialog : public ArdourDialog
progress_bar.set_fraction (progress); }
ARDOUR::Session& getSession() { return *session; };
- string get_selected_header_format() {
- return header_format_combo.get_active_text(); };
+ int get_selected_header_format() { return header_format_combo.get_active_row_number(); }
string get_selected_file_name() { return file_entry.get_text(); };
private:
diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc
index 1d81f57ade..51ecc71dfd 100644
--- a/gtk2_ardour/export_range_markers_dialog.cc
+++ b/gtk2_ardour/export_range_markers_dialog.cc
@@ -74,7 +74,7 @@ ExportRangeMarkersDialog::process_range_markers_export(Locations::LocationList&
string filepath = get_target_filepath(
get_selected_file_name(),
currentLocation->name(),
- get_selected_header_format());
+ sndfile_file_endings_strings[get_selected_header_format()]);
initSpec(filepath);