Commit 2e20bb18 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Using implicit declaration for LibVLCpp::Media

parent 6d898921
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <QUrl> #include <QUrl>
#include "Media.h" #include "Media.h"
#include "MetaDataManager.h" #include "MetaDataManager.h"
#include "VLCMedia.h"
#include "Clip.h"
QPixmap* Media::defaultSnapshot = NULL; QPixmap* Media::defaultSnapshot = NULL;
const QString Media::VideoExtensions = "*.mov *.avi *.mkv *.mpg *.mpeg *.wmv *.mp4 *.ogg *.ogv"; const QString Media::VideoExtensions = "*.mov *.avi *.mkv *.mpg *.mpeg *.wmv *.mp4 *.ogg *.ogv";
......
...@@ -37,9 +37,10 @@ ...@@ -37,9 +37,10 @@
#include <QFileInfo> #include <QFileInfo>
#include <QHash> #include <QHash>
#include "VLCMedia.h" namespace LibVLCpp
#include "Clip.h" {
class Media;
}
class Clip; class Clip;
/** /**
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "Library.h" #include "Library.h"
#include "SettingsManager.h" #include "SettingsManager.h"
#include "VLCMediaPlayer.h" #include "VLCMediaPlayer.h"
#include "VLCMedia.h"
#include "Clip.h"
#include <QThreadPool> #include <QThreadPool>
#include <QRunnable> #include <QRunnable>
......
...@@ -52,8 +52,8 @@ class MetaDataWorker : public QObject ...@@ -52,8 +52,8 @@ class MetaDataWorker : public QObject
private: private:
void metaDataAvailable(); void metaDataAvailable();
static void lock( MetaDataWorker* metaDataWorker, uint8_t** pcm_buffer , unsigned int size ); static void lock( MetaDataWorker* metaDataWorker, quint8** pcm_buffer , unsigned int size );
static void unlock( MetaDataWorker* metaDataWorker, uint8_t* pcm_buffer, static void unlock( MetaDataWorker* metaDataWorker, quint8* pcm_buffer,
unsigned int channels, unsigned int rate, unsigned int channels, unsigned int rate,
unsigned int nb_samples, unsigned int bits_per_sample, unsigned int nb_samples, unsigned int bits_per_sample,
unsigned int size, int pts ); unsigned int size, int pts );
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "Media.h" #include "Media.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
#include "VLCMediaPlayer.h" #include "VLCMediaPlayer.h"
#include "VLCMedia.h"
#include "Clip.h"
ClipRenderer::ClipRenderer() : ClipRenderer::ClipRenderer() :
GenericRenderer(), GenericRenderer(),
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "Clip.h" #include "Clip.h"
#include "VLCMediaPlayer.h" #include "VLCMediaPlayer.h"
#include "WaitCondition.hpp" #include "WaitCondition.hpp"
#include "VLCMedia.h"
#include <QReadWriteLock> #include <QReadWriteLock>
#include <QWaitCondition> #include <QWaitCondition>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "LightVideoFrame.h" #include "LightVideoFrame.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
#include "VLCMediaPlayer.h" #include "VLCMediaPlayer.h"
#include "VLCMedia.h"
ImageClipWorkflow::ImageClipWorkflow( Clip *clip ) : ImageClipWorkflow::ImageClipWorkflow( Clip *clip ) :
ClipWorkflow( clip ), ClipWorkflow( clip ),
......
...@@ -462,13 +462,13 @@ MainWorkflow::heightChanged( const QVariant &height ) ...@@ -462,13 +462,13 @@ MainWorkflow::heightChanged( const QVariant &height )
m_height = height.toUInt(); m_height = height.toUInt();
} }
uint32_t quint32
MainWorkflow::getWidth() const MainWorkflow::getWidth() const
{ {
return m_width; return m_width;
} }
uint32_t quint32
MainWorkflow::getHeight() const MainWorkflow::getHeight() const
{ {
return m_height; return m_height;
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "StackedBuffer.hpp" #include "StackedBuffer.hpp"
#include "LightVideoFrame.h" #include "LightVideoFrame.h"
#include "Clip.h" #include "Clip.h"
#include "VLCMedia.h"
#include <QReadWriteLock> #include <QReadWriteLock>
VideoClipWorkflow::VideoClipWorkflow( Clip *clip ) : VideoClipWorkflow::VideoClipWorkflow( Clip *clip ) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment