Skip to content

Commit

Permalink
Fix issue #180 File browsing unavailable in headless mode using guita…
Browse files Browse the repository at this point in the history 
…rix -G
  • Loading branch information
@brummer10
brummer10 committed Sep 27, 2024
1 parent 8cdd8f2 commit 941669d
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 17 deletions.
2 changes: 1 addition & 1 deletion trunk/src/gx_head/gui/gx_jconv_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void IRWindow::init_connect() {
builder->find_widget("reset_button", wReset);
wReset->signal_clicked().connect(sigc::mem_fun(*this, &IRWindow::on_reset_clicked));
builder->find_widget("open_button", wOpen);
if (!machine.get_jack()) wOpen->set_sensitive(false);
//if (!machine.get_jack()) wOpen->set_sensitive(false);
wOpen->signal_clicked().connect(sigc::mem_fun(*this, &IRWindow::on_open));

builder->find_widget("apply_button", wApply);
Expand Down
74 changes: 58 additions & 16 deletions trunk/src/gx_head/gui/gx_stackbox_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ static void on_file_chooser_response(int response_id, Gxw::Switch *button, Gtk::
{
if (response_id == Gtk::RESPONSE_OK) {
Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = Glib::filename_from_uri(d->get_uri(), hostname);
Gtk::RecentManager::Data data;
bool result_uncertain;
Expand Down Expand Up @@ -375,10 +379,10 @@ static Gtk::FileChooserDialog* create_looper_filedialog(Gxw::Switch* button,

static void select_looper_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine, const string& id) {
assert(w);
if (!machine.get_jack()) {
w->hide();
return;
}
//if (!machine.get_jack()) {
// w->hide();
// return;
//}
gx_engine::Parameter *p = check_get_parameter(machine, id, w);
if (!p) {
return;
Expand Down Expand Up @@ -407,6 +411,10 @@ static void select_looper_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine
}
static Glib::ustring recent_filename = "";
static Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = machine.get_parameter_value<string>(id);
Glib::ustring loop_dir = machine.get_options().get_loop_dir();
if (!recent_filename.empty()) {
Expand All @@ -431,6 +439,10 @@ static void on_nam_chooser_response(int response_id, Gxw::Switch *button, Gtk::F
{
if (response_id == Gtk::RESPONSE_OK) {
Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = Glib::filename_from_uri(d->get_uri(), hostname);
Gtk::RecentManager::Data data;
bool result_uncertain;
Expand Down Expand Up @@ -463,11 +475,16 @@ static Gtk::FileChooserDialog* create_nam_filedialog(Gxw::Switch* button,
all->add_pattern("*");
all->set_name("All Files");
d->add_filter(all);
Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
d->signal_response().connect(
[=,&machine](int response) {
on_nam_chooser_response(response, button, d, machine, id); });
d->add_shortcut_folder_uri(
Glib::filename_to_uri(machine.get_options().get_loop_dir(), "localhost"));
Glib::filename_to_uri(machine.get_options().get_loop_dir(), hostname));
return d;
}

Expand All @@ -489,10 +506,10 @@ std::string getPathName(const std::string& s) {

static void select_nam_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine, const string& id) {
assert(w);
if (!machine.get_jack()) {
w->hide();
return;
}
//if (!machine.get_jack()) {
// w->hide();
// return;
//}
gx_engine::Parameter *p = check_get_parameter(machine, id, w);
if (!p) {
return;
Expand All @@ -501,6 +518,10 @@ static void select_nam_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine, c
GxBuilder::set_tooltip_text_connect_handler(*w, p->l_desc());
}
static Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
static std::map<std::string, Gtk::FileChooserDialog*> sel_windows;
Gtk::FileChooserDialog*& sel = sel_windows[id];
Glib::ustring filename = machine.get_parameter_value<string>(id);
Expand All @@ -524,6 +545,10 @@ static void select_nam_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine, c
}
static Glib::ustring recent_filename = "";
static Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = machine.get_parameter_value<string>(id);
if (!recent_filename.empty()) {
sel->set_uri(Glib::filename_to_uri (recent_filename, hostname));
Expand All @@ -549,6 +574,10 @@ static void on_rtneural_chooser_response(int response_id, Gxw::Switch *button, G
{
if (response_id == Gtk::RESPONSE_OK) {
Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = Glib::filename_from_uri(d->get_uri(), hostname);
Gtk::RecentManager::Data data;
bool result_uncertain;
Expand Down Expand Up @@ -578,6 +607,11 @@ static Gtk::FileChooserDialog* create_rtneural_filedialog(Gxw::Switch* button,
all->add_pattern("*");
all->set_name("All Files");
d->add_filter(all);
Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
d->signal_response().connect(
[=,&machine](int response) {
on_rtneural_chooser_response(response, button, d, machine, id); });
Expand All @@ -588,10 +622,10 @@ static Gtk::FileChooserDialog* create_rtneural_filedialog(Gxw::Switch* button,

static void select_rtneural_file(Gxw::Switch *w, gx_engine::GxMachineBase& machine, const string& id) {
assert(w);
if (!machine.get_jack()) {
w->hide();
return;
}
// if (!machine.get_jack()) {
// w->hide();
// return;
//}
gx_engine::Parameter *p = check_get_parameter(machine, id, w);
if (!p) {
return;
Expand All @@ -600,6 +634,10 @@ static void select_rtneural_file(Gxw::Switch *w, gx_engine::GxMachineBase& machi
GxBuilder::set_tooltip_text_connect_handler(*w, p->l_desc());
}
static Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
static std::map<std::string, Gtk::FileChooserDialog*> sel_windows;
Gtk::FileChooserDialog*& sel = sel_windows[id];
Glib::ustring filename = machine.get_parameter_value<string>(id);
Expand All @@ -623,6 +661,10 @@ static void select_rtneural_file(Gxw::Switch *w, gx_engine::GxMachineBase& machi
}
static Glib::ustring recent_filename = "";
static Glib::ustring hostname = "localhost";
if (! machine.get_jack()) {
hostname = Gio::Resolver::get_default()->lookup_by_address
(Gio::InetAddress::create( machine.get_options().get_rpcaddress()));
}
Glib::ustring filename = machine.get_parameter_value<string>(id);
if (!recent_filename.empty()) {
sel->set_uri(Glib::filename_to_uri (recent_filename, hostname));
Expand Down Expand Up @@ -839,9 +881,9 @@ void StackBoxBuilder::create_feedback_switch(const char *sw_type, const std::str
}

void StackBoxBuilder::create_fload_switch(const char *sw_type, const char *id, const std::string& idf) {
if (!machine.get_jack()) {
return;
}
//if (!machine.get_jack()) {
// return;
// }
auto sw = new Gxw::Switch(sw_type);
sw->set_name("effect_on_off");
sw->show();
Expand Down

0 comments on commit 941669d

Please sign in to comment.