Skip to content

Commit 1989b09

Browse files
jonoomphjonoomph
authored
Merge pull request #101 from jeffski/fix-install-paths
Fix install paths for headers and effects
2 parents a4a8a49 + 526be42 commit 1989b09

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

‎include/DecklinkInput.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
#include <fcntl.h>
6363

6464
#include "DeckLinkAPI.h"
65-
#include "../include/Frame.h"
65+
#include "Frame.h"
6666
#include "CacheMemory.h"
67-
#include "../include/OpenMPUtilities.h"
67+
#include "OpenMPUtilities.h"
6868

6969
/// Implementation of the Blackmagic Decklink API (used by the DecklinkReader)
7070
class DeckLinkInputDelegate : public IDeckLinkInputCallback

‎include/DecklinkOutput.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363

6464
#include "DeckLinkAPI.h"
6565
#include "CacheMemory.h"
66-
#include "../include/Frame.h"
67-
#include "../include/OpenMPUtilities.h"
66+
#include "Frame.h"
67+
#include "OpenMPUtilities.h"
6868

6969
enum OutputSignal {
7070
kOutputSignalPip = 0,

‎include/FrameMapper.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
#include <vector>
3535
#include <memory>
3636
#include "CacheMemory.h"
37-
#include "../include/ReaderBase.h"
38-
#include "../include/Frame.h"
39-
#include "../include/Fraction.h"
40-
#include "../include/Exceptions.h"
41-
#include "../include/KeyFrame.h"
37+
#include "ReaderBase.h"
38+
#include "Frame.h"
39+
#include "Fraction.h"
40+
#include "Exceptions.h"
41+
#include "KeyFrame.h"
4242

4343

4444
// Include FFmpeg headers and macros

‎include/PlayerBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define OPENSHOT_PLAYER_BASE_H
3030

3131
#include <iostream>
32-
#include "../include/ReaderBase.h"
32+
#include "ReaderBase.h"
3333

3434
using namespace std;
3535

‎include/Qt/AudioPlaybackThread.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#ifndef OPENSHOT_AUDIO_PLAYBACK_THREAD_H
3030
#define OPENSHOT_AUDIO_PLAYBACK_THREAD_H
3131

32-
#include "../../include/ReaderBase.h"
33-
#include "../../include/RendererBase.h"
34-
#include "../../include/AudioReaderSource.h"
32+
#include "../ReaderBase.h"
33+
#include "../RendererBase.h"
34+
#include "../AudioReaderSource.h"
3535

3636
namespace openshot
3737
{

‎include/Qt/PlayerPrivate.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
#ifndef OPENSHOT_PLAYER_PRIVATE_H
3030
#define OPENSHOT_PLAYER_PRIVATE_H
3131

32-
#include "../../include/ReaderBase.h"
33-
#include "../../include/RendererBase.h"
34-
#include "../../include/AudioReaderSource.h"
35-
#include "../../include/Qt/AudioPlaybackThread.h"
36-
#include "../../include/Qt/VideoPlaybackThread.h"
37-
#include "../../include/Qt/VideoCacheThread.h"
32+
#include "../ReaderBase.h"
33+
#include "../RendererBase.h"
34+
#include "../AudioReaderSource.h"
35+
#include "../Qt/AudioPlaybackThread.h"
36+
#include "../Qt/VideoPlaybackThread.h"
37+
#include "../Qt/VideoCacheThread.h"
3838

3939
namespace openshot
4040
{

‎include/Qt/VideoCacheThread.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#ifndef OPENSHOT_VIDEO_CACHE_THREAD_H
2929
#define OPENSHOT_VIDEO_CACHE_THREAD_H
3030

31-
#include "../../include/OpenMPUtilities.h"
32-
#include "../../include/ReaderBase.h"
33-
#include "../../include/RendererBase.h"
31+
#include "../OpenMPUtilities.h"
32+
#include "../ReaderBase.h"
33+
#include "../RendererBase.h"
3434

3535
namespace openshot
3636
{

‎include/Qt/VideoPlaybackThread.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#ifndef OPENSHOT_VIDEO_PLAYBACK_THREAD_H
3030
#define OPENSHOT_VIDEO_PLAYBACK_THREAD_H
3131

32-
#include "../../include/ReaderBase.h"
33-
#include "../../include/RendererBase.h"
32+
#include "../ReaderBase.h"
33+
#include "../RendererBase.h"
3434

3535
namespace openshot
3636
{

‎include/QtPlayer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
#include <iostream>
3333
#include <vector>
34-
#include "../include/PlayerBase.h"
35-
#include "../include/Qt/PlayerPrivate.h"
36-
#include "../include/RendererBase.h"
34+
#include "PlayerBase.h"
35+
#include "Qt/PlayerPrivate.h"
36+
#include "RendererBase.h"
3737

3838
using namespace std;
3939

‎include/RendererBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef OPENSHOT_RENDERER_BASE_H
2929
#define OPENSHOT_RENDERER_BASE_H
3030

31-
#include "../include/Frame.h"
31+
#include "Frame.h"
3232
#include <stdlib.h> // for realloc
3333
#include <memory>
3434

0 commit comments

Comments
 (0)