smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ardour-merge

Browse source
This commit is contained in:
Paul Davis 2014-09-02 13:07:42 -04:00
commit 4a1b09b6c1
4 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/tracks_control_panel.logic.cc
View file

@ -1636,8 +1636,31 @@ TracksControlPanel::bufsize_as_string (uint32_t sz)
framecnt_t
TracksControlPanel::get_sample_rate () const
{
float r = atof (_sample_rate_combo.get_active_text ());
/* the string may have been translated with an abbreviation for
const string sample_rate = _sample_rate_combo.get_active_text ();
if ( "44.1 kHz" == sample_rate )
{
return 44100;
} else if ( "48 kHz" == sample_rate )
{
return 48000;
} else if ( "88.2 kHz" == sample_rate )
{
return 88200;
} else if ( "96 kHz" == sample_rate )
{
return 96000;
} else if ( "172.4 kHz" == sample_rate )
{
return 172400;
} else if ( "192 kHz" == sample_rate )
{
return 192000;
}
float r = atof (sample_rate);
/* the string may have been translated with an abbreviation for
* thousands, so use a crude heuristic to fix this.
*/
if (r < 1000.0) {