Add support for device opening
This commit is contained in:
1 parent
bc2b3d040c
commit
f6f3cf15ab
6 files changed
+25
-26
No files matched your search
@@ -449,7 +449,7 @@ Void ModulesHandle::activateModule()
|
||||
if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == MODULE_API_2 )
|
||||
{
|
||||
std::vector<PlaYUVerFrame*> apcFrameList;
|
||||
for( UInt i = 0; i < videoSubWindowList.size(); i++ )
|
||||
for( Int i = 0; i < videoSubWindowList.size(); i++ )
|
||||
{
|
||||
apcFrameList.push_back( pcCurrAppModuleIf->m_pcSubWindow[i]->getCurrFrame() );
|
||||
}
|
||||
|
||||
+8
-13
@@ -189,11 +189,6 @@ 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 )
|
||||
@@ -293,10 +288,10 @@ Void PlaYUVerApp::open()
|
||||
}
|
||||
}
|
||||
|
||||
Void PlaYUVerApp::openDevice()
|
||||
{
|
||||
load( "/dev/video0", NULL );
|
||||
}
|
||||
// Void PlaYUVerApp::openDevice()
|
||||
//{
|
||||
// loadFile( "/dev/video0", NULL );
|
||||
//}
|
||||
|
||||
Void PlaYUVerApp::openRecent()
|
||||
{
|
||||
@@ -620,9 +615,9 @@ 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_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++ )
|
||||
@@ -747,7 +742,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[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 )
|
||||
{
|
||||
|
||||
+1
-3
@@ -89,7 +89,7 @@ class PlaYUVerApp : public QMainWindow
|
||||
* File functions slots
|
||||
*/
|
||||
void open();
|
||||
void openDevice();
|
||||
// void openDevice();
|
||||
void openRecent();
|
||||
void save();
|
||||
void format();
|
||||
@@ -129,8 +129,6 @@ class PlaYUVerApp : public QMainWindow
|
||||
static VideoSubWindow* findVideoStreamSubWindow( const PlaYUVerSubWindowHandle* windowManager,
|
||||
const QString& fileName );
|
||||
|
||||
Void load( QString fileName, PlaYUVerStreamInfo* pStreamInfo );
|
||||
|
||||
Void updateMenus();
|
||||
|
||||
Void createActions();
|
||||
|
||||
Reference in new issue
Block a user