smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 15:15:41 +01:00
Code Issues Projects Releases Wiki Activity

move ugly glib mkdir stuff to ensure_directory function and make methods smarter about when they should use it

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-04-04 13:41:51 -05:00 • committed by Nikolaus Gullotta
parent c0f6dfde6b
commit 584a6c334b
No known key found for this signature in database
GPG key ID: 565F60578092AA31
2 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gtk2_ardour/mixer_snapshot_dialog.cc
View file

@ -94,6 +94,20 @@ void MixerSnapshotDialog::set_session(Session* s)
refill();
}
void MixerSnapshotDialog::ensure_directory(bool global)
{
string path;
if(global) {
path = Glib::build_filename(user_config_directory(-1), "mixer_snapshots");
} else {
path = Glib::build_filename(_session->session_directory().root_path(), "mixer_snapshots");
}
if(!Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS & Glib::FILE_TEST_IS_DIR)) {
::g_mkdir(path.c_str(), 0775);
}
}
void MixerSnapshotDialog::display_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint time, bool global)
{
if (data.get_target() != "string") {
@ -110,6 +124,10 @@ void MixerSnapshotDialog::display_drag_data_received(const Glib::RefPtr<Gdk::Dra
TreeView* source;
tv->get_object_drag_data(paths, &source);
if(!paths.empty()) {
ensure_directory(global);
}
for (list<string>::const_iterator i = paths.begin(); i != paths.end(); i++) {
string new_path;
if(global) {
@ -323,16 +341,6 @@ void MixerSnapshotDialog::new_snapshot(bool global)
return;
}
string path = Glib::build_filename(user_config_directory(-1), "mixer_snapshots");
if(!Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS & Glib::FILE_TEST_IS_DIR)) {
::g_mkdir(path.c_str(), 0775);
}
path = Glib::build_filename(_session->session_directory().root_path(), "mixer_snapshots");
if(!Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS & Glib::FILE_TEST_IS_DIR)) {
::g_mkdir(path.c_str(), 0775);
}
MixerSnapshot* snap = new MixerSnapshot(_session);
Prompter prompt(true);
@ -350,6 +358,7 @@ void MixerSnapshotDialog::new_snapshot(bool global)
prompt.get_vbox()->pack_start(*sel);
if(prompt.run() == RESPONSE_ACCEPT) {
ensure_directory(global);
string new_label;
prompt.get_result(new_label);
if (new_label.length() > 0) {
@ -376,16 +385,6 @@ void MixerSnapshotDialog::new_snapshot(bool global)
void MixerSnapshotDialog::new_snap_from_session(bool global)
{
string testpath = Glib::build_filename(user_config_directory(-1), "mixer_snapshots");
if(!Glib::file_test(testpath.c_str(), Glib::FILE_TEST_EXISTS & Glib::FILE_TEST_IS_DIR)) {
::g_mkdir(testpath.c_str(), 0775);
}
testpath = Glib::build_filename(_session->session_directory().root_path(), "mixer_snapshots");
if(!Glib::file_test(testpath.c_str(), Glib::FILE_TEST_EXISTS & Glib::FILE_TEST_IS_DIR)) {
::g_mkdir(testpath.c_str(), 0775);
}
Gtk::FileChooserDialog session_selector(_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
string session_parent_dir = Glib::path_get_dirname(_session->path());
session_selector.add_button(Stock::CANCEL, RESPONSE_CANCEL);
@ -399,6 +398,8 @@ void MixerSnapshotDialog::new_snap_from_session(bool global)
return;
}
ensure_directory(global);
string session_path = session_selector.get_filename();
MixerSnapshot* snapshot = new MixerSnapshot(_session, session_path);

1
gtk2_ardour/mixer_snapshot_dialog.h
View file

@ -50,6 +50,7 @@ class MixerSnapshotDialog : public ArdourWindow
private:
void display_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint time, bool);
void ensure_directory(bool);
void new_snapshot(bool);
void new_snap_from_session(bool);