From b1a926739333575ed7e06f50447817ae42066a37 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 29 Apr 2016 01:42:23 +0100 Subject: [PATCH] Add action to load device --- app/PlaYUVerApp.cpp | 15 +++++++++++++++ app/PlaYUVerApp.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp index c3f2d26..f0f958e 100644 --- a/app/PlaYUVerApp.cpp +++ b/app/PlaYUVerApp.cpp @@ -195,6 +195,11 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo ) printMessage( "File " + fileName + " do not exist!", LOG_ERROR ); return; } + load( fileName, pStreamInfo ); +} + +Void PlaYUVerApp::load( QString fileName, PlaYUVerStreamInfo* pStreamInfo ) +{ VideoSubWindow *videoSubWindow = PlaYUVerApp::findVideoStreamSubWindow( m_pcWindowHandle, fileName ); if( videoSubWindow ) { @@ -289,6 +294,11 @@ Void PlaYUVerApp::open() } } +Void PlaYUVerApp::openDevice() +{ + load( "/dev/video0", NULL ); +} + Void PlaYUVerApp::openRecent() { QAction *action = qobject_cast( sender() ); @@ -607,6 +617,10 @@ Void PlaYUVerApp::createActions() m_arrayActions[OPEN_ACT]->setStatusTip( tr( "Open stream" ) ); connect( m_arrayActions[OPEN_ACT], SIGNAL( triggered() ), this, SLOT( open() ) ); + m_arrayActions[OPEN_DEVICE_ACT] = new QAction( tr( "&Open Capture Device" ), this ); + m_arrayActions[OPEN_DEVICE_ACT]->setStatusTip( tr( "Open capture device (webcam)" ) ); + connect( m_arrayActions[OPEN_DEVICE_ACT], SIGNAL( triggered() ), this, SLOT( openDevice() ) ); + m_arrayRecentFilesActions.resize( MAX_RECENT_FILES ); for( Int i = 0; i < MAX_RECENT_FILES; i++ ) { @@ -720,6 +734,7 @@ Void PlaYUVerApp::createMenus() m_arrayMenu[FILE_MENU] = menuBar()->addMenu( tr( "&File" ) ); m_arrayMenu[FILE_MENU]->addAction( m_arrayActions[OPEN_ACT] ); + m_arrayMenu[FILE_MENU]->addAction( m_arrayActions[OPEN_DEVICE_ACT] ); m_arrayMenu[RECENT_MENU] = m_arrayMenu[FILE_MENU]->addMenu( tr( "Open Recent" ) ); for( Int i = 0; i < MAX_RECENT_FILES; ++i ) { diff --git a/app/PlaYUVerApp.h b/app/PlaYUVerApp.h index 7f26498..3d1f263 100644 --- a/app/PlaYUVerApp.h +++ b/app/PlaYUVerApp.h @@ -92,6 +92,7 @@ private Q_SLOTS: * File functions slots */ void open(); + void openDevice(); void openRecent(); void save(); void format(); @@ -131,6 +132,8 @@ private: static VideoSubWindow* findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager, const QString& fileName ); + Void load( QString fileName, PlaYUVerStreamInfo* pStreamInfo ); + Void updateMenus(); Void createActions(); @@ -210,6 +213,7 @@ private: enum APP_ACTION_LIST { OPEN_ACT = 0, + OPEN_DEVICE_ACT, SAVE_ACT, FORMAT_ACT, RELOAD_ACT,