projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix uninitialised variable causing garbage output from panners in some cases.
[ardour.git]
/
libs
/
ardour
/
file_source.cc
diff --git
a/libs/ardour/file_source.cc
b/libs/ardour/file_source.cc
index be4ded9a2c4e5a3bccf4234dfbc6103fe7066bd4..f4f3c40d9d6d6f76e64c93ef22b6ec942db2206f 100644
(file)
--- a/
libs/ardour/file_source.cc
+++ b/
libs/ardour/file_source.cc
@@
-33,17
+33,17
@@
#include "pbd/strsplit.h"
#include "pbd/shortpath.h"
#include "pbd/enumwriter.h"
#include "pbd/strsplit.h"
#include "pbd/shortpath.h"
#include "pbd/enumwriter.h"
+#include "pbd/filesystem.h"
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/thread.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/thread.h>
+#include "ardour/data_type.h"
#include "ardour/file_source.h"
#include "ardour/file_source.h"
-#include "ardour/directory_names.h"
#include "ardour/session.h"
#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/source_factory.h"
-#include "ardour/filename_extensions.h"
+#include "ardour/source.h"
+#include "ardour/utils.h"
#include "i18n.h"
#include "i18n.h"
@@
-123,11
+123,7
@@
FileSource::init (const string& pathstr, bool must_exist)
}
set_within_session_from_path (_path);
}
set_within_session_from_path (_path);
-
- if (!within_session()) {
- _session.ensure_search_path_includes (Glib::path_get_dirname (_path), _type);
- }
-
+
_name = Glib::path_get_basename (_path);
if (_file_is_new && must_exist) {
_name = Glib::path_get_basename (_path);
if (_file_is_new && must_exist) {
@@
-282,7
+278,7
@@
FileSource::find (Session& s, DataType type, const string& path, bool must_exist
++j;
while (j != hits.end()) {
++j;
while (j != hits.end()) {
- if (inodes_same (*i, *j)) {
+ if (
PBD::sys::
inodes_same (*i, *j)) {
/* *i and *j are the same file; break out of the loop early */
break;
}
/* *i and *j are the same file; break out of the loop early */
break;
}