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

cherry pick 3aeb5a27bd4772ede0f31ea579bc031ca2019235 from old ardour-merge branch and hand resolve

Browse source
This commit is contained in:
Paul Davis 2014-08-07 11:57:10 -04:00
parent ae26a2cc45
commit 018770adda
7 changed files with 202 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gtk2_ardour/tracks_control_panel.logic.cc
View file

@ -1269,37 +1269,15 @@ TracksControlPanel::on_browse_button (WavesButton*)
{
using namespace std;
#ifdef __APPLE__
set_keep_above(false);
set_keep_above (false);
_default_path_name = ARDOUR::choose_folder_dialog(Config->get_default_session_parent_dir(), _("Choose Default Path"));
set_keep_above(true);
set_keep_above (true);
if( !_default_path_name.empty() )
if (!_default_path_name.empty()) {
_default_open_path.set_text(_default_path_name);
else
} else {
_default_open_path.set_text(Config->get_default_session_parent_dir());
return;
#endif
#ifdef _WIN32
string fileTitle;
set_keep_above(false);
bool result = ARDOUR::choose_folder_dialog(fileTitle, _("Choose Default Path"));
set_keep_above(true);
// if path was chosen in dialog
if (result) {
_default_path_name = fileTitle;
}
if (!_default_path_name.empty())
_default_open_path.set_text(_default_path_name);
else
_default_open_path.set_text(Config->get_default_session_parent_dir());
return;
#endif // _WIN32
}
}
void