diff options
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/configuration.cc | 63 | ||||
-rw-r--r-- | libs/ardour/session.cc | 38 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 9 |
3 files changed, 71 insertions, 39 deletions
diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc index 1460491180..b164d418ab 100644 --- a/libs/ardour/configuration.cc +++ b/libs/ardour/configuration.cc @@ -20,6 +20,9 @@ #include <unistd.h> #include <cstdio> /* for snprintf, grrr */ +#include <glib.h> +#include <glib/gstdio.h> /* for g_stat() */ + #include <pbd/failed_constructor.h> #include <pbd/xml++.h> #include <pbd/filesystem.h> @@ -80,7 +83,8 @@ Configuration::load_state () bool found = false; sys::path system_rc_file; - + struct stat statbuf; + /* load system configuration first */ if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(), @@ -91,18 +95,28 @@ Configuration::load_state () string rcfile = system_rc_file.to_string(); - cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl; + /* stupid XML Parser hates empty files */ - if (!tree.read (rcfile.c_str())) { - error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg; + if (g_stat (rcfile.c_str(), &statbuf)) { return -1; } - current_owner = ConfigVariableBase::System; - - if (set_state (*tree.root())) { - error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; - return -1; + if (statbuf.st_size != 0) { + cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl; + + if (!tree.read (rcfile.c_str())) { + error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg; + return -1; + } + + current_owner = ConfigVariableBase::System; + + if (set_state (*tree.root())) { + error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + return -1; + } + } else { + error << _("your system Ardour configuration file is empty. This probably means that there as an error installing Ardour") << endmsg; } } @@ -114,23 +128,32 @@ Configuration::load_state () "ardour.rc", user_rc_file)) { XMLTree tree; - found = true; - + string rcfile = user_rc_file.to_string(); - cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl; + /* stupid XML parser hates empty files */ - if (!tree.read (rcfile)) { - error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg; + if (g_stat (rcfile.c_str(), &statbuf)) { return -1; } - current_owner = ConfigVariableBase::Config; - - if (set_state (*tree.root())) { - error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; - return -1; - } + if (statbuf.st_size != 0) { + cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl; + + if (!tree.read (rcfile)) { + error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg; + return -1; + } + + current_owner = ConfigVariableBase::Config; + + if (set_state (*tree.root())) { + error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + return -1; + } + } else { + warning << _("your Ardour configuration file is empty. This is not normal.") << endmsg; + } } if (!found) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 19d562f844..dbec881b0b 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2542,40 +2542,42 @@ Session::region_name (string& result, string base, bool newlevel) const void Session::add_region (boost::shared_ptr<Region> region) { - boost::shared_ptr<Region> other; bool added = false; { Glib::Mutex::Lock lm (region_lock); - RegionList::iterator x; + if (region == 0) { + error << _("Session::add_region() ignored a null region. Warning: you might have lost a region.") << endmsg; + } else { - for (x = regions.begin(); x != regions.end(); ++x) { + RegionList::iterator x; - other = x->second; + for (x = regions.begin(); x != regions.end(); ++x) { - if (region->region_list_equivalent (other)) { - break; + if (region->region_list_equivalent (x->second)) { + break; + } } - } - - if (x == regions.end()) { - pair<RegionList::key_type,RegionList::mapped_type> entry; + if (x == regions.end()) { - entry.first = region->id(); - entry.second = region; + pair<RegionList::key_type,RegionList::mapped_type> entry; - pair<RegionList::iterator,bool> x = regions.insert (entry); + entry.first = region->id(); + entry.second = region; + pair<RegionList::iterator,bool> x = regions.insert (entry); - if (!x.second) { - return; - } + + if (!x.second) { + return; + } - added = true; - } + added = true; + } + } } /* mark dirty because something has changed even if we didn't diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index d8d3d82810..4b7e0875ee 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1398,7 +1398,14 @@ Session::load_regions (const XMLNode& node) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((region = XMLRegionFactory (**niter, false)) == 0) { - error << _("Session: cannot create Region from XML description.") << endmsg; + error << _("Session: cannot create Region from XML description."); + const XMLProperty *name = (**niter).property("name"); + + if (name) { + error << " " << string_compose (_("Can not load state for region '%1'"), name->value()); + } + + error << endmsg; } } |