update:重新调整整个项目结构

This commit is contained in:
Barry 2019-06-20 13:07:01 +08:00
parent d7fbd2671b
commit f2755e0d41
60 changed files with 42 additions and 32 deletions

View file

@ -23,13 +23,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
#DEFINES += SKIP_FRAMES
#DEFINES += USE_QTQUICK
contains(DEFINES, USE_QTQUICK) {
QT += quickwidgets
}
# 源码
SOURCES += \
main.cpp \
@ -43,38 +36,19 @@ FORMS += \
# 子工程
include ($$PWD/common/common.pri)
include ($$PWD/server/server.pri)
include ($$PWD/adb/adb.pri)
include ($$PWD/decoder/decoder.pri)
include ($$PWD/render/render.pri)
include ($$PWD/stream/stream.pri)
include ($$PWD/android/android.pri)
include ($$PWD/controller/controller.pri)
include ($$PWD/uibase/uibase.pri)
include ($$PWD/fontawesome/fontawesome.pri)
include ($$PWD/filehandler/filehandler.pri)
include ($$PWD/recorder/recorder.pri)
include ($$PWD/util/util.pri)
include ($$PWD/device/device.pri)
include ($$PWD/ui/ui.pri)
# 附加包含路径
INCLUDEPATH += \
$$PWD/../third_party/ffmpeg/include \
$$PWD/common \
$$PWD/server \
$$PWD/adb \
$$PWD/decoder \
$$PWD/render \
$$PWD/stream \
$$PWD/android \
$$PWD/controller \
$$PWD/uibase \
$$PWD/filehandler \
$$PWD/recorder \
$$PWD/common \
$$PWD/adb \
$$PWD/uibase \
$$PWD/util \
$$PWD/device \
$$PWD/ui \
$$PWD/device \
$$PWD/fontawesome

View file

@ -10,3 +10,5 @@ SOURCES += \
$$PWD/avframeconvert.cpp \
$$PWD/videobuffer.cpp
#DEFINES += SKIP_FRAMES

View file

@ -64,6 +64,11 @@ VideoForm *Device::getVideoForm()
return m_videoForm;
}
Controller *Device::getController()
{
return m_controller;
}
void Device::initSignals()
{
if (m_videoForm) {

View file

@ -29,6 +29,7 @@ public:
virtual ~Device();
VideoForm *getVideoForm();
Controller* getController();
private:
void initSignals();

View file

@ -3,3 +3,25 @@ HEADERS += \
SOURCES += \
$$PWD/device.cpp
include ($$PWD/server/server.pri)
include ($$PWD/decoder/decoder.pri)
include ($$PWD/render/render.pri)
include ($$PWD/stream/stream.pri)
include ($$PWD/android/android.pri)
include ($$PWD/controller/controller.pri)
include ($$PWD/filehandler/filehandler.pri)
include ($$PWD/recorder/recorder.pri)
include ($$PWD/ui/ui.pri)
INCLUDEPATH += \
$$PWD/../../third_party/ffmpeg/include \
$$PWD/server \
$$PWD/decoder \
$$PWD/render \
$$PWD/stream \
$$PWD/android \
$$PWD/controller \
$$PWD/filehandler \
$$PWD/recorder \
$$PWD/ui

View file

@ -9,3 +9,9 @@ HEADERS += \
FORMS += \
$$PWD/videoform.ui \
$$PWD/toolform.ui
#DEFINES += USE_QTQUICK
contains(DEFINES, USE_QTQUICK) {
QT += quickwidgets
}

View file

@ -253,8 +253,8 @@ void Dialog::on_closeScreenCheck_stateChanged(int arg1)
return;
}
if (ui->closeScreenCheck->isChecked()) {
m_device->getVideoForm()->getController()->setScreenPowerMode(ControlMsg::SPM_OFF);
m_device->getController()->setScreenPowerMode(ControlMsg::SPM_OFF);
} else {
m_device->getVideoForm()->getController()->setScreenPowerMode(ControlMsg::SPM_NORMAL);
m_device->getController()->setScreenPowerMode(ControlMsg::SPM_NORMAL);
}
}