#include <climits>
#include <cerrno>
+#include <glibmm/miscutils.h>
+
#include "pbd/compose.h"
#include "pbd/error.h"
-#include "ardour/session_utils.h"
#include "ardour/filename_extensions.h"
#include "ardour/utils.h"
using namespace std;
using namespace PBD;
+namespace ARDOUR {
+
int
-ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
+find_session (string str, string& path, string& snapshot, bool& isnew)
{
struct stat statbuf;
char buf[PATH_MAX+1];
if (S_ISDIR (statbuf.st_mode)) {
- string::size_type slash = str.find_last_of ('/');
+ string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
if (slash == string::npos) {
/* a subdirectory of cwd, so statefile should be ... */
- string tmp;
- tmp = str;
- tmp += '/';
- tmp += str;
- tmp += statefile_suffix;
+ string tmp = Glib::build_filename (str, str+statefile_suffix);
/* is it there ? */
} else if (S_ISREG (statbuf.st_mode)) {
- string::size_type slash = str.find_last_of ('/');
+ string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
string::size_type suffix;
/* remove the suffix */
as "dirname" does.
*/
- string::size_type slash = str.find_last_of ('/');
+ string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
if (slash == string::npos) {
return 0;
}
+
+} // namespace ARDOUR