Modification of files location

This commit is contained in:
jfmcarreira committed 2014-03-26 05:04:03 +00:00
1 parent 74f74fec61
commit 875ebfd79a
27 files changed
+41 -44

No files matched your search

+4 -5
View File
@@ -16,7 +16,6 @@ SET( PROJECT_NAME playuver )
# Project directories
SET( SRC_DIR source )
SET( INC_DIR source )
SET( LIB_DIR ${SRC_DIR}/lib )
SET( RSC_DIR resources )
SET( UI_DIR ui )
@@ -28,10 +27,9 @@ SET( CMAKE_INCLUDE_CURRENT_DIR ON )
# Instruct CMake to run moc automatically when needed.
SET( CMAKE_AUTOMOC ON )
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${INC_DIR} )
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SRC_DIR}/app ${SRC_DIR}/lib )
FILE( GLOB SOURCES_FILES ${SRC_DIR}/*.cpp )
FILE( GLOB HEADERS_FILES ${INC_DIR}/*.h )
FILE( GLOB SOURCES_FILES ${SRC_DIR}/app/*.cpp ${SRC_DIR}/lib/*.cpp )
FILE( GLOB FORMS_FILES ${UI_DIR}/*.ui )
FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc )
@@ -82,9 +80,10 @@ IF( USE_WERROR )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
ENDIF()
ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HEADERS_FILES} ${RESOURCES_RCC_FILES} )
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${MODULES_LIBS} ${LINKER_LIBS} )
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${PLAYUVER_LIBS} ${MODULES_LIBS} ${LINKER_LIBS} )
IF( NOT USE_QT4)
QT5_USE_MODULES( ${PROJECT_NAME} ${CURR_QT_MODULES} )
+8 -2
View File
@@ -97,10 +97,16 @@ function(status text)
endfunction()
macro(ADD_MODULE name files )
macro(ADD_MODULE name file )
set(__modulename "Module${name}")
add_library( ${__modulename} ${files} )
add_library( ${__modulename} ${SRC_DIR}/modules/${file} )
set(MODULES_LIBS ${MODULES_LIBS} ${__modulename})
ADD_DEFINITIONS( -DUSE_${name} )
unset(__modulename)
endmacro()
macro(ADD_LIB name )
include_directories( ${SRC_DIR}/lib/${name} )
add_library( ${name} ${SRC_DIR}/lib/${files} )
set(PLAYUVER_LIBS ${PLAYUVER_LIBS} ${name})
endmacro()
+1 -1
View File
@@ -2,5 +2,5 @@
# Filter frame module
######################################################################################
ADD_MODULE( FilterFrame "${MODULES_DIR}/FilterFrame.cpp" )
ADD_MODULE( FilterFrame "FilterFrame.cpp" )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -270,7 +270,7 @@ Void InputStream::readNextFrame()
Bool InputStream::writeFrame( const QString& filename )
{
m_pcCurrFrame->getQimage().save( filename );
//m_pcCurrFrame->getQimage().save( filename );
return true;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -241,7 +241,7 @@ Void SubWindowHandle::normalSize()
Void SubWindowHandle::zoomToFit()
{
// Scale to a smaller size that the real to a nicer look
QSize niceFit( m_cScrollArea->viewport()->size().width() - 10, m_cScrollArea->viewport()->size().height() - 10 );
QSize niceFit( m_cScrollArea->viewport()->size().width() - 5, m_cScrollArea->viewport()->size().height() - 5 );
if( (Int)m_pCurrStream->getWidth() <= niceFit.width() && (Int)m_pCurrStream->getHeight() <= niceFit.height() )
{
normalSize();
@@ -316,7 +316,7 @@ QSize SubWindowHandle::sizeHint() const
return maxSize;
}
Void SubWindowHandle::closeEvent( QCloseEvent *event )
void SubWindowHandle::closeEvent( QCloseEvent *event )
{
event->accept();
}
@@ -142,7 +142,7 @@ public:
}
protected:
Void closeEvent( QCloseEvent *event );
void closeEvent( QCloseEvent *event );
public Q_SLOTS:
bool playEvent();
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -81,15 +81,33 @@ plaYUVerApp::plaYUVerApp()
Void plaYUVerApp::closeEvent( QCloseEvent *event )
{
mdiArea->closeAllSubWindows();
if( mdiArea->currentSubWindow() )
Int msgBoxCloseRet = QMessageBox::Yes;
if( mdiArea->subWindowList().size() >= 1 )
{
event->ignore();
QMessageBox msgBoxClose;
msgBoxClose.setText( "There are sub windows opened." );
msgBoxClose.setInformativeText( "Close all?" );
msgBoxClose.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
msgBoxClose.setDefaultButton( QMessageBox::No );
msgBoxCloseRet = msgBoxClose.exec();
}
else
switch( msgBoxCloseRet )
{
writeSettings();
event->accept();
case QMessageBox::Yes:
mdiArea->closeAllSubWindows();
if( mdiArea->subWindowList().isEmpty() )
{
writeSettings();
event->accept();
}
else
{
event->ignore();
}
break;
case QMessageBox::No:
default:
event->ignore();
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -26,8 +26,6 @@
#include "LibMemAlloc.h"
#include "LibMemory.h"
#include <QImage>
namespace plaYUVer
{
@@ -368,28 +366,6 @@ Void PlaYUVerFrame::CopyFrom( PlaYUVerFrame* input_frame )
}
QImage PlaYUVerFrame::getQimage()
{
QImage img( m_uiWidth, m_uiHeight, QImage::Format_RGB888 );
Pel*** bufferRGB = getPelBufferRGB();
if( sizeof(Pel) == sizeof(unsigned char) )
{
for( UInt y = 0; y < m_uiHeight; y++ )
{
for( UInt x = 0; x < m_uiWidth; x++ )
{
img.setPixel( x, y, qRgb( bufferRGB[COLOR_R][y][x], bufferRGB[COLOR_G][y][x], bufferRGB[COLOR_B][y][x] ) );
}
}
}
else
{
Q_ASSERT( 0 );
}
return img;
}
UInt64 PlaYUVerFrame::getBytesPerFrame()
{
switch( m_iPixelFormat )
@@ -65,8 +65,6 @@ public:
static Pixel ConvertPixel( Pixel sInputPixel, ColorSpace eOutputSpace );
Pixel getPixelValue(const QPoint &pos, ColorSpace color);
QImage getQimage();
UChar* getQImageBuffer()
{
return m_pcRGBPelInterlaced;