diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-13 23:00:24 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-13 23:00:24 -0400 |
commit | f00b3b7f111e36537d773daef0ae77b03d11f82f (patch) | |
tree | 4bfdd432199a7d4a4cbfc7769493e6bedaa5e51f /gtk2_ardour/transcode_video_dialog.cc | |
parent | 31d234b48c36bddb4d5228a3abee9c4419403879 (diff) | |
parent | 80a13145f398e1c4ea22b3f8a25a5b38d3c5e328 (diff) |
merge with master
Diffstat (limited to 'gtk2_ardour/transcode_video_dialog.cc')
-rw-r--r-- | gtk2_ardour/transcode_video_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index f3373c0376..fa5d447a3a 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -388,7 +388,7 @@ TranscodeVideoDialog::launch_transcode () if (scale_combo.get_active_row_number() == 0 ) { scale_width =0; } else { - scale_width = atoi(scale_combo.get_active_text().c_str()); + scale_width = atoi(scale_combo.get_active_text()); } if (!aspect_checkbox.get_active()) { scale_height = 0; @@ -443,7 +443,7 @@ TranscodeVideoDialog::scale_combo_changed () if (scale_combo.get_active_row_number() == 0 ) { h = transcoder->get_height(); } else { - h = floor(atof(scale_combo.get_active_text().c_str()) / m_aspect); + h = floor(atof(scale_combo.get_active_text()) / m_aspect); } height_spinner.set_value(h); } @@ -477,7 +477,7 @@ TranscodeVideoDialog::update_bitrate () if (scale_combo.get_active_row_number() == 0 ) { br *= transcoder->get_width(); } else { - br *= atof(scale_combo.get_active_text().c_str()); + br *= atof(scale_combo.get_active_text()); } if (br != 0) { bitrate_spinner.set_value(floor(br/10000.0)*10); |