vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pCtrlVideo )
+ if( it->pCtrlVideo )
{
// detach vout thread from VideoControl
- (*it).pCtrlVideo->detachVoutWindow( );
+ it->pCtrlVideo->detachVoutWindow( );
// memorize width/height before VideoControl is destroyed
- (*it).width = (*it).pCtrlVideo->getPosition()->getWidth();
- (*it).height = (*it).pCtrlVideo->getPosition()->getHeight();
- (*it).pCtrlVideo = NULL;
+ it->width = it->pCtrlVideo->getPosition()->getWidth();
+ it->height = it->pCtrlVideo->getPosition()->getHeight();
+ it->pCtrlVideo = NULL;
}
}
CtrlVideo* pCtrlVideo = getBestCtrlVideo();
if( pCtrlVideo )
{
- pCtrlVideo->attachVoutWindow( (*it).pVoutWindow );
- (*it).pCtrlVideo = pCtrlVideo;
+ pCtrlVideo->attachVoutWindow( it->pVoutWindow );
+ it->pCtrlVideo = pCtrlVideo;
}
}
}
vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pCtrlVideo == pCtrlVideo )
+ if( it->pCtrlVideo == pCtrlVideo )
{
// detach vout thread from VideoControl
- (*it).pCtrlVideo->detachVoutWindow( );
- (*it).width = (*it).pCtrlVideo->getPosition()->getWidth();
- (*it).height = (*it).pCtrlVideo->getPosition()->getHeight();
- (*it).pCtrlVideo = NULL;
+ it->pCtrlVideo->detachVoutWindow( );
+ it->width = it->pCtrlVideo->getPosition()->getWidth();
+ it->height = it->pCtrlVideo->getPosition()->getHeight();
+ it->pCtrlVideo = NULL;
break;
}
}
vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pCtrlVideo == NULL )
+ if( it->pCtrlVideo == NULL )
{
- pCtrlVideo->attachVoutWindow( (*it).pVoutWindow,
- (*it).width, (*it).height );
- (*it).pCtrlVideo = pCtrlVideo;
+ pCtrlVideo->attachVoutWindow( it->pVoutWindow,
+ it->width, it->height );
+ it->pCtrlVideo = pCtrlVideo;
break;
}
}
// save vout characteristics
m_SavedWndVec.push_back( SavedWnd( pWnd, pVoutWindow, pCtrlVideo ) );
- msg_Dbg( pWnd, "New vout : Ctrl = %p, w x h = %dx%d",
+ msg_Dbg( pWnd, "New vout : Ctrl = %p, w x h = %ix%i",
pCtrlVideo, width, height );
}
vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pWnd == pWnd )
+ if( it->pWnd == pWnd )
{
msg_Dbg( getIntf(), "vout released vout=%p, VideoCtrl=%p",
- pWnd, (*it).pCtrlVideo );
+ pWnd, it->pCtrlVideo );
// if a video control was being used, detach from it
- if( (*it).pCtrlVideo )
+ if( it->pCtrlVideo )
{
- (*it).pCtrlVideo->detachVoutWindow( );
+ it->pCtrlVideo->detachVoutWindow( );
}
// remove resources
- delete (*it).pVoutWindow;
+ delete it->pVoutWindow;
m_SavedWndVec.erase( it );
break;
}
void VoutManager::setSizeWnd( vout_window_t *pWnd, int width, int height )
{
- msg_Dbg( pWnd, "setSize (%dx%d) received from vout thread",
+ msg_Dbg( pWnd, "setSize (%ix%i) received from vout thread",
width, height );
vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pWnd == pWnd )
+ if( it->pWnd == pWnd )
{
- VoutWindow* pVoutWindow = (*it).pVoutWindow;
+ VoutWindow* pVoutWindow = it->pVoutWindow;
pVoutWindow->setOriginalWidth( width );
pVoutWindow->setOriginalHeight( height );
vector<SavedWnd>::iterator it;
for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
{
- if( (*it).pWnd == pWnd )
+ if( it->pWnd == pWnd )
{
VoutWindow* pVoutWindow = it->pVoutWindow;
configureFullscreen( *pVoutWindow );