summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorkevineriklee <kevin@kevlee.org>2014-06-01 01:27:13 -0400
committerkevineriklee <kevin@kevlee.org>2014-06-01 01:27:13 -0400
commit7acc48d07a616527c81d866c85d6694b1ef73b59 (patch)
treefc06f47e977a9ab160121bca55b5bfef377e08a5 /plugins
parentd71048c4e56a7cc4c9c8b4fb4602f57f227deb8c (diff)
Fix mediafoundation after math refactor
Diffstat (limited to 'plugins')
-rw-r--r--plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp4
-rw-r--r--plugins/soundsourcemediafoundation/soundsourcemediafoundation.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
index 47f58d7755..4e10c6e300 100644
--- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
+++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
@@ -85,7 +85,7 @@ SoundSourceMediaFoundation::~SoundSourceMediaFoundation()
CoUninitialize();
}
-int SoundSourceMediaFoundation::open()
+Result SoundSourceMediaFoundation::open()
{
if (sDebug) {
qDebug() << "open()" << m_qFilename;
@@ -373,7 +373,7 @@ inline unsigned long SoundSourceMediaFoundation::length()
return len % kNumChannels == 0 ? len : len + 1;
}
-int SoundSourceMediaFoundation::parseHeader()
+Result SoundSourceMediaFoundation::parseHeader()
{
setType("m4a");
diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h
index ed7b57918b..016f6901c2 100644
--- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h
+++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h
@@ -23,7 +23,7 @@
#include <QFile>
#include <QString>
-#include "defs.h"
+#include "util/defs.h"
#include "defs_version.h"
#include "soundsource.h"
@@ -41,11 +41,11 @@ class SoundSourceMediaFoundation : public Mixxx::SoundSource {
public:
SoundSourceMediaFoundation(QString filename);
~SoundSourceMediaFoundation();
- int open();
+ Result open();
long seek(long filepos);
unsigned read(unsigned long size, const SAMPLE *buffer);
inline long unsigned length();
- int parseHeader();
+ Result parseHeader();
static QList<QString> supportedFileExtensions();
private: