X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_format_dialog.cc;h=bc9a55357472f0e71d69a73462636e0feecd2720;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=5707f3beb7ce55f607ff80b8f27dea56bfedfb37;hpb=5c926136988757f1f11a14c11720ed3daac3195f;p=ardour.git

diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 5707f3beb7..bc9a553574 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -18,6 +18,8 @@
 
 */
 
+#include <gtkmm/stock.h>
+
 #include "ardour/session.h"
 #include "ardour/export_format_specification.h"
 
@@ -298,7 +300,7 @@ ExportFormatDialog::set_session (ARDOUR::Session* s)
 	if (sample_rate_view.get_selection()->count_selected_rows() == 0) {
 		Gtk::ListStore::Children::iterator it;
 		for (it = sample_rate_list->children().begin(); it != sample_rate_list->children().end(); ++it) {
-			if ((framecnt_t) (*it)->get_value (sample_rate_cols.ptr)->rate == _session->nominal_frame_rate()) {
+			if ((samplecnt_t) (*it)->get_value (sample_rate_cols.ptr)->rate == _session->nominal_sample_rate()) {
 				sample_rate_view.get_selection()->select (it);
 				break;
 			}
@@ -689,7 +691,7 @@ ExportFormatDialog::change_sample_rate_selection (bool select, WeakSampleRatePtr
 	if (select) {
 		ExportFormatManager::SampleRatePtr ptr = rate.lock();
 		if (ptr && _session) {
-			src_quality_combo.set_sensitive ((uint32_t) ptr->rate != _session->frame_rate());
+			src_quality_combo.set_sensitive ((uint32_t) ptr->rate != _session->sample_rate());
 		}
 	}
 }
@@ -875,7 +877,7 @@ void
 ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & time)
 {
 	// TODO position
-	clock.set (_session->convert_to_frames (time), true);
+	clock.set (_session->convert_to_samples (time), true);
 
 	AudioClock::Mode mode(AudioClock::Timecode);
 
@@ -886,8 +888,8 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti
 	  case AnyTime::BBT:
 		mode = AudioClock::BBT;
 		break;
-	  case AnyTime::Frames:
-		mode = AudioClock::Frames;
+	  case AnyTime::Samples:
+		mode = AudioClock::Samples;
 		break;
 	  case AnyTime::Seconds:
 		mode = AudioClock::MinSec;
@@ -904,24 +906,25 @@ ExportFormatDialog::update_time (AnyTime & time, AudioClock const & clock)
 		return;
 	}
 
-	framecnt_t frames = clock.current_duration();
+	samplecnt_t samples = clock.current_duration();
 
 	switch (clock.mode()) {
 	  case AudioClock::Timecode:
 		time.type = AnyTime::Timecode;
-		_session->timecode_time (frames, time.timecode);
+		_session->timecode_time (samples, time.timecode);
 		break;
 	  case AudioClock::BBT:
 		time.type = AnyTime::BBT;
-		_session->bbt_time (frames, time.bbt);
+		_session->bbt_time (samples, time.bbt);
 		break;
+	  case AudioClock::Seconds:
 	  case AudioClock::MinSec:
 		time.type = AnyTime::Seconds;
-		time.seconds = (double) frames / _session->frame_rate();
+		time.seconds = (double) samples / _session->sample_rate();
 		break;
-	  case AudioClock::Frames:
-		time.type = AnyTime::Frames;
-		time.frames = frames;
+	  case AudioClock::Samples:
+		time.type = AnyTime::Samples;
+		time.samples = samples;
 		break;
 	}
 }