summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2016-11-17 17:51:48 +0100
committerChristian Stromme <christian.stromme@qt.io>2017-05-03 13:29:30 +0000
commitc50fb7493753606cd436b08d33022f9b789dd2ea (patch)
tree21ec6994932fd37abc079fa10f5cd2af4083c762 /src
parent8e4d966f4e5546787257de046d2c3af8a19214b4 (diff)
DirectShow: Merge the helpers and common folder
Change-Id: Ie1c39c26ae6dec288daafb24b5aa0b6cc2bdd218 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/directshow/common/common.pri19
-rw-r--r--src/plugins/directshow/common/directshowbasefilter.cpp (renamed from src/plugins/directshow/helpers/directshowbasefilter.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowbasefilter.h (renamed from src/plugins/directshow/helpers/directshowbasefilter.h)0
-rw-r--r--src/plugins/directshow/common/directshoweventloop.cpp (renamed from src/plugins/directshow/helpers/directshoweventloop.cpp)0
-rw-r--r--src/plugins/directshow/common/directshoweventloop.h (renamed from src/plugins/directshow/helpers/directshoweventloop.h)0
-rw-r--r--src/plugins/directshow/common/directshowglobal.h (renamed from src/plugins/directshow/helpers/directshowglobal.h)0
-rw-r--r--src/plugins/directshow/common/directshowmediatype.cpp (renamed from src/plugins/directshow/helpers/directshowmediatype.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowmediatype.h (renamed from src/plugins/directshow/helpers/directshowmediatype.h)0
-rw-r--r--src/plugins/directshow/common/directshowmediatypeenum.cpp (renamed from src/plugins/directshow/helpers/directshowmediatypeenum.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowmediatypeenum.h (renamed from src/plugins/directshow/helpers/directshowmediatypeenum.h)0
-rw-r--r--src/plugins/directshow/common/directshowobject.cpp (renamed from src/plugins/directshow/helpers/directshowobject.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowobject.h (renamed from src/plugins/directshow/helpers/directshowobject.h)0
-rw-r--r--src/plugins/directshow/common/directshowpin.cpp (renamed from src/plugins/directshow/helpers/directshowpin.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowpin.h (renamed from src/plugins/directshow/helpers/directshowpin.h)0
-rw-r--r--src/plugins/directshow/common/directshowpinenum.cpp (renamed from src/plugins/directshow/helpers/directshowpinenum.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowpinenum.h (renamed from src/plugins/directshow/helpers/directshowpinenum.h)0
-rw-r--r--src/plugins/directshow/common/directshowutils.cpp (renamed from src/plugins/directshow/helpers/directshowutils.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowutils.h (renamed from src/plugins/directshow/helpers/directshowutils.h)0
-rw-r--r--src/plugins/directshow/common/directshowvideobuffer.cpp (renamed from src/plugins/directshow/helpers/directshowvideobuffer.cpp)0
-rw-r--r--src/plugins/directshow/common/directshowvideobuffer.h (renamed from src/plugins/directshow/helpers/directshowvideobuffer.h)0
-rw-r--r--src/plugins/directshow/directshow.pro1
-rw-r--r--src/plugins/directshow/helpers/helpers.pri24
22 files changed, 19 insertions, 25 deletions
diff --git a/src/plugins/directshow/common/common.pri b/src/plugins/directshow/common/common.pri
index 9b7c1e3f..06f8582a 100644
--- a/src/plugins/directshow/common/common.pri
+++ b/src/plugins/directshow/common/common.pri
@@ -1,11 +1,30 @@
INCLUDEPATH += $$PWD
HEADERS += \
+ $$PWD/directshowbasefilter.h \
+ $$PWD/directshoweventloop.h \
+ $$PWD/directshowglobal.h \
+ $$PWD/directshowmediatype.h \
+ $$PWD/directshowmediatypeenum.h \
+ $$PWD/directshowobject.h \
+ $$PWD/directshowpin.h \
+ $$PWD/directshowpinenum.h \
+ $$PWD/directshowvideobuffer.h \
+ $$PWD/directshowutils.h \
$$PWD/directshowvideoprobecontrol.h \
$$PWD/directshowaudioprobecontrol.h \
$$PWD/directshowsamplegrabber.h
SOURCES += \
+ $$PWD/directshowbasefilter.cpp \
+ $$PWD/directshoweventloop.cpp \
+ $$PWD/directshowmediatype.cpp \
+ $$PWD/directshowmediatypeenum.cpp \
+ $$PWD/directshowobject.cpp \
+ $$PWD/directshowpin.cpp \
+ $$PWD/directshowpinenum.cpp \
+ $$PWD/directshowvideobuffer.cpp \
+ $$PWD/directshowutils.cpp \
$$PWD/directshowvideoprobecontrol.cpp \
$$PWD/directshowaudioprobecontrol.cpp \
$$PWD/directshowsamplegrabber.cpp
diff --git a/src/plugins/directshow/helpers/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 342f0c27..342f0c27 100644
--- a/src/plugins/directshow/helpers/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
diff --git a/src/plugins/directshow/helpers/directshowbasefilter.h b/src/plugins/directshow/common/directshowbasefilter.h
index 9a2f4456..9a2f4456 100644
--- a/src/plugins/directshow/helpers/directshowbasefilter.h
+++ b/src/plugins/directshow/common/directshowbasefilter.h
diff --git a/src/plugins/directshow/helpers/directshoweventloop.cpp b/src/plugins/directshow/common/directshoweventloop.cpp
index ef85c042..ef85c042 100644
--- a/src/plugins/directshow/helpers/directshoweventloop.cpp
+++ b/src/plugins/directshow/common/directshoweventloop.cpp
diff --git a/src/plugins/directshow/helpers/directshoweventloop.h b/src/plugins/directshow/common/directshoweventloop.h
index 609e5313..609e5313 100644
--- a/src/plugins/directshow/helpers/directshoweventloop.h
+++ b/src/plugins/directshow/common/directshoweventloop.h
diff --git a/src/plugins/directshow/helpers/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h
index 5f391710..5f391710 100644
--- a/src/plugins/directshow/helpers/directshowglobal.h
+++ b/src/plugins/directshow/common/directshowglobal.h
diff --git a/src/plugins/directshow/helpers/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index 65882806..65882806 100644
--- a/src/plugins/directshow/helpers/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
diff --git a/src/plugins/directshow/helpers/directshowmediatype.h b/src/plugins/directshow/common/directshowmediatype.h
index 7f495f3b..7f495f3b 100644
--- a/src/plugins/directshow/helpers/directshowmediatype.h
+++ b/src/plugins/directshow/common/directshowmediatype.h
diff --git a/src/plugins/directshow/helpers/directshowmediatypeenum.cpp b/src/plugins/directshow/common/directshowmediatypeenum.cpp
index 8fbdf7de..8fbdf7de 100644
--- a/src/plugins/directshow/helpers/directshowmediatypeenum.cpp
+++ b/src/plugins/directshow/common/directshowmediatypeenum.cpp
diff --git a/src/plugins/directshow/helpers/directshowmediatypeenum.h b/src/plugins/directshow/common/directshowmediatypeenum.h
index 9b058fc5..9b058fc5 100644
--- a/src/plugins/directshow/helpers/directshowmediatypeenum.h
+++ b/src/plugins/directshow/common/directshowmediatypeenum.h
diff --git a/src/plugins/directshow/helpers/directshowobject.cpp b/src/plugins/directshow/common/directshowobject.cpp
index db1817a8..db1817a8 100644
--- a/src/plugins/directshow/helpers/directshowobject.cpp
+++ b/src/plugins/directshow/common/directshowobject.cpp
diff --git a/src/plugins/directshow/helpers/directshowobject.h b/src/plugins/directshow/common/directshowobject.h
index cfac16f6..cfac16f6 100644
--- a/src/plugins/directshow/helpers/directshowobject.h
+++ b/src/plugins/directshow/common/directshowobject.h
diff --git a/src/plugins/directshow/helpers/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index b49c3f8a..b49c3f8a 100644
--- a/src/plugins/directshow/helpers/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
diff --git a/src/plugins/directshow/helpers/directshowpin.h b/src/plugins/directshow/common/directshowpin.h
index 97e80838..97e80838 100644
--- a/src/plugins/directshow/helpers/directshowpin.h
+++ b/src/plugins/directshow/common/directshowpin.h
diff --git a/src/plugins/directshow/helpers/directshowpinenum.cpp b/src/plugins/directshow/common/directshowpinenum.cpp
index 910bba77..910bba77 100644
--- a/src/plugins/directshow/helpers/directshowpinenum.cpp
+++ b/src/plugins/directshow/common/directshowpinenum.cpp
diff --git a/src/plugins/directshow/helpers/directshowpinenum.h b/src/plugins/directshow/common/directshowpinenum.h
index 77214e37..77214e37 100644
--- a/src/plugins/directshow/helpers/directshowpinenum.h
+++ b/src/plugins/directshow/common/directshowpinenum.h
diff --git a/src/plugins/directshow/helpers/directshowutils.cpp b/src/plugins/directshow/common/directshowutils.cpp
index 96fabd6d..96fabd6d 100644
--- a/src/plugins/directshow/helpers/directshowutils.cpp
+++ b/src/plugins/directshow/common/directshowutils.cpp
diff --git a/src/plugins/directshow/helpers/directshowutils.h b/src/plugins/directshow/common/directshowutils.h
index 09c81c25..09c81c25 100644
--- a/src/plugins/directshow/helpers/directshowutils.h
+++ b/src/plugins/directshow/common/directshowutils.h
diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.cpp b/src/plugins/directshow/common/directshowvideobuffer.cpp
index 7f94da97..7f94da97 100644
--- a/src/plugins/directshow/helpers/directshowvideobuffer.cpp
+++ b/src/plugins/directshow/common/directshowvideobuffer.cpp
diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.h b/src/plugins/directshow/common/directshowvideobuffer.h
index 85e02b53..85e02b53 100644
--- a/src/plugins/directshow/helpers/directshowvideobuffer.h
+++ b/src/plugins/directshow/common/directshowvideobuffer.h
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 35301474..2857f87d 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -11,7 +11,6 @@ SOURCES += dsserviceplugin.cpp
mingw: DEFINES += NO_DSHOW_STRSAFE
include(common/common.pri)
-include(helpers/helpers.pri)
qtConfig(directshow-player): include(player/player.pri)
include(camera/camera.pri)
diff --git a/src/plugins/directshow/helpers/helpers.pri b/src/plugins/directshow/helpers/helpers.pri
deleted file mode 100644
index ca883eeb..00000000
--- a/src/plugins/directshow/helpers/helpers.pri
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
- $$PWD/directshowbasefilter.h \
- $$PWD/directshoweventloop.h \
- $$PWD/directshowglobal.h \
- $$PWD/directshowmediatype.h \
- $$PWD/directshowmediatypeenum.h \
- $$PWD/directshowobject.h \
- $$PWD/directshowpin.h \
- $$PWD/directshowpinenum.h \
- $$PWD/directshowvideobuffer.h \
- $$PWD/directshowutils.h
-
-SOURCES += \
- $$PWD/directshowbasefilter.cpp \
- $$PWD/directshoweventloop.cpp \
- $$PWD/directshowmediatype.cpp \
- $$PWD/directshowmediatypeenum.cpp \
- $$PWD/directshowobject.cpp \
- $$PWD/directshowpin.cpp \
- $$PWD/directshowpinenum.cpp \
- $$PWD/directshowvideobuffer.cpp \
- $$PWD/directshowutils.cpp