projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
namespace change to help out on non-linux platforms
[ardour.git]
/
libs
/
ardour
/
audio_region_importer.cc
diff --git
a/libs/ardour/audio_region_importer.cc
b/libs/ardour/audio_region_importer.cc
index 53367a35a443282d752ee5b99546b06b27ae97a5..1b9263b0261909ea5d82c7b62064401c0d1ccce1 100644
(file)
--- a/
libs/ardour/audio_region_importer.cc
+++ b/
libs/ardour/audio_region_importer.cc
@@
-33,7
+33,7
@@
#include "ardour/region_factory.h"
#include "ardour/session_directory.h"
#include "ardour/region_factory.h"
#include "ardour/session_directory.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace PBD;
using namespace std;
using namespace PBD;
@@
-127,7
+127,7
@@
AudioRegionImporter::~AudioRegionImporter ()
string
AudioRegionImporter::get_info () const
{
string
AudioRegionImporter::get_info () const
{
-
fram
ecnt_t length, position;
+
sampl
ecnt_t length, position;
Timecode::Time length_time, position_time;
std::ostringstream oss;
Timecode::Time length_time, position_time;
std::ostringstream oss;
@@
-236,7
+236,7
@@
AudioRegionImporter::parse_source_xml ()
char buf[128];
std::string source_dir(get_sound_dir (source));
XMLNode * source_node;
char buf[128];
std::string source_dir(get_sound_dir (source));
XMLNode * source_node;
- XMLProperty
*
prop;
+ XMLProperty
const *
prop;
// Get XML for sources
if (!(source_node = source.root()->child (X_("Sources")))) {
// Get XML for sources
if (!(source_node = source.root()->child (X_("Sources")))) {