Thread: [Jahshaka-cvs] SF.net SVN: editopia:[164] cinesuite/cineplay-cinecode/trunk/src/Common.cpp
Status: Beta
Brought to you by:
jahshaka
From: <tim...@us...> - 2008-07-29 00:01:02
|
Revision: 164 http://editopia.svn.sourceforge.net/editopia/?rev=164&view=rev Author: timdewhirst Date: 2008-07-29 00:00:58 +0000 (Tue, 29 Jul 2008) Log Message: ----------- cinesuite - use correct about box for cineplay/cinecode Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-28 23:59:59 UTC (rev 163) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-29 00:00:58 UTC (rev 164) @@ -39,13 +39,18 @@ #include "Utils.h" #include "Tray.h" #include "windows/toolbar.h" -#include "windows/about.h" #include "windows/addfav.h" #include "windows/removefav.h" #include "windows/styledlg.h" #include "log.h" #include "GridLayoutCallback.h" +#ifdef BUILD_CINECODE +#include "windows/about_cinecode.h" +#else +#include "windows/about.h" +#endif + // qt #include <qapplication.h> #include <qcursor.h> @@ -145,7 +150,7 @@ m_hTitlebar = CineUtils::FindWidget(WIDGET_TITLEBAR, parent); - //setup the jahwidgets::qt3::TimelineSlider + // setup the jahwidgets::qt3::TimelineSlider m_timeSlider = CineUtils::FindWidget( WIDGET_TIMESLIDER, h2 ); if( m_timeSlider ) @@ -1514,7 +1519,7 @@ } -void Common::dragEnterEvent(QDragEnterEvent *de) +void Common::dragEnterEvent( QDragEnterEvent* de ) { DEBUG_LOG; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-08 08:04:13
|
Revision: 173 http://editopia.svn.sourceforge.net/editopia/?rev=173&view=rev Author: timdewhirst Date: 2008-08-08 08:04:11 +0000 (Fri, 08 Aug 2008) Log Message: ----------- cinesuite - add audio fallback path - add logging of which stores are actually being used Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-08 08:03:08 UTC (rev 172) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-08 08:04:11 UTC (rev 173) @@ -369,10 +369,11 @@ QString storeTypeVideo; QString storeTypeAudio; + QStringList audioStoreTypes = QStringList() << "openal" << "sdl"; { QSettings settings; storeTypeVideo = settings.readEntry( SETTINGS_VIDEOSTORETYPE, "opengl"); - storeTypeAudio = settings.readEntry( SETTINGS_AUDIOSTORETYPE, "openal"); + storeTypeAudio = settings.readEntry( SETTINGS_AUDIOSTORETYPE, audioStoreTypes.front()); } //Create the right video store object @@ -387,6 +388,7 @@ m_jwStore = store; m_storeAsWidget = store; m_handlePush = true; + log__ << "created opengl store"; } else { @@ -403,6 +405,7 @@ m_storeAsWidget = store; m_handlePush = true; convertFormat = L"b8g8r8a8"; + log__ << "created opengl2 store"; } else { @@ -419,6 +422,7 @@ m_storeAsWidget = store; m_handlePush = true; m_playerRefresh = true; + log__ << "created sdl_video store"; } if ( !m_storeAsWidget ) @@ -458,13 +462,23 @@ int audioPreRoll = settings.readNumEntry( SETTINGS_AUDIOPREROLL, 8 ); int audioBuffer = settings.readNumEntry( SETTINGS_AUDIOBUFFER, 1024 ); - qDebug( "Common::SetupStores: creating audio store (%s)\n", storeTypeAudio.ascii() ); - if ( storeTypeAudio == "sdl" ) - storeTypeAudio = "sdl_audio"; - storeTypeAudio += ":"; + while( !m_audioStore ) + { + log__ << "Common::SetupStores: creating audio store: " << storeTypeAudio.ascii(); + if ( storeTypeAudio == "sdl" ) + storeTypeAudio = "sdl_audio"; + storeTypeAudio += ":"; + + m_audioStore = ml::create_store( storeTypeAudio, ml::frame_type_ptr() ); - m_audioStore = ml::create_store( storeTypeAudio, ml::frame_type_ptr() ); + // we may need a fallback + if ( audioStoreTypes.isEmpty() ) + break; + audioStoreTypes.pop_front(); + storeTypeAudio = audioStoreTypes.front(); + } + DEBUG_LOG << "m_audioStore: " << m_audioStore; if ( !m_audioStore ) { @@ -595,8 +609,6 @@ // and set input 0 to be active m_activePlayerAndStore = 0; - m_jwStore->invalidate_layout(); - return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-09 08:56:23
|
Revision: 179 http://editopia.svn.sourceforge.net/editopia/?rev=179&view=rev Author: timdewhirst Date: 2008-08-09 08:56:21 +0000 (Sat, 09 Aug 2008) Log Message: ----------- cinesuite - fix audio fallback to include failing on initialization - fix help links Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-09 08:55:02 UTC (rev 178) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-09 08:56:21 UTC (rev 179) @@ -471,6 +471,7 @@ audioBuffer = settings.readNumEntry( SETTINGS_AUDIOBUFFER, 1024 ); } + bool audio_success = true; while( !m_audioStore ) { log__ << "Common::SetupStores: creating audio store: " << storeTypeAudio.ascii(); @@ -479,13 +480,22 @@ storeTypeAudio += ":"; m_audioStore = ml::create_store( storeTypeAudio, ml::frame_type_ptr() ); + audio_success &= ( m_audioStore != ml::store_type_ptr() ); + if ( audio_success ) + audio_success &= m_audioStore->init(); + if ( audio_success ) + break; + else + m_audioStore = ml::store_type_ptr(); + // we may need a fallback if ( audioStoreTypes.isEmpty() ) break; audioStoreTypes.pop_front(); storeTypeAudio = audioStoreTypes.front(); + audio_success = true; } DEBUG_LOG << "m_audioStore: " << m_audioStore; @@ -499,16 +509,6 @@ return false; } - if( !m_audioStore->init() ) - { - QMessageBox::critical( NULL, - tr( "Initialization Failure" ), - tr( "Critical failure during initialization: failed to initialize audio" ), - QMessageBox::Abort, - QMessageBox::NoButton ); - return false; - } - m_audioStore->properties().get_property_with_string( "preroll" ).set( audioPreRoll ); m_audioStore->properties().get_property_with_string( "buffer" ).set( audioBuffer ); } @@ -811,7 +811,7 @@ #ifdef BUILD_CINECODE QString helpFile = "help_cinecode.html"; #else - QString helpFile = "help_cinecode.html"; + QString helpFile = "help.html"; #endif #ifdef Q_OS_MACX This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-11-07 12:22:14
|
Revision: 236 http://editopia.svn.sourceforge.net/editopia/?rev=236&view=rev Author: timdewhirst Date: 2008-11-07 11:50:06 +0000 (Fri, 07 Nov 2008) Log Message: ----------- cinesuite * fix for crash in commandline options * reinstate splash image Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-11-07 09:58:48 UTC (rev 235) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-11-07 11:50:06 UTC (rev 236) @@ -79,6 +79,7 @@ #include <QDesktopWidget> #include <QUrl> #include <QAction> +#include <QResource> #include <QDebug> @@ -283,19 +284,19 @@ version ); return false; } + if ( *I == "-debug" ) { log_stream.open( "log" ); Log::setLogLevel( 4 ); Log::setDestination( log_stream ); atexit( close_log ); - ++I; } else { Log::setLogLevel( 3 ); - ++I; } + if ( *I == "-css" && I+1 != E ) { CSSEditor* editor = new CSSEditor; @@ -303,8 +304,8 @@ editor->setFilename( *(++I) ); editor->setMinimumSize( 600, 400 ); editor->show(); - ++I; } + ++I; } //Init OpenLibraries @@ -515,8 +516,11 @@ { DEBUG_LOG; + QResource qr( ":/images/splash" ); + qDebug() << "Common::LoadDefaultInput:" << qr.isValid(); + ml::frame_type_ptr frame( new ml::frame_type() ); - frame->set_image( CineUtils::QImageToImage( QImage( ":/images/splash" ) ) ); + frame->set_image( CineUtils::QImageToImage( QImage( ":/images/splash" ).convertToFormat( QImage::Format_ARGB32 ) ) ); FrameUpdate( activePlayer(), frame ); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-11-13 16:08:13
|
Revision: 245 http://editopia.svn.sourceforge.net/editopia/?rev=245&view=rev Author: timdewhirst Date: 2008-11-13 16:08:10 +0000 (Thu, 13 Nov 2008) Log Message: ----------- cinesuite * ensure log file is written to TEMP Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-11-13 15:39:43 UTC (rev 244) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-11-13 16:08:10 UTC (rev 245) @@ -62,6 +62,7 @@ #include <QMessageBox> #include <QSettings> #include <QDir> +#include <QDateTime> #include <QDragEnterEvent> #include <QDropEvent> #include <QEvent> @@ -71,7 +72,6 @@ #include <QPushButton> #include <QLineEdit> #include <QCheckBox> -#include <qlistview.h> #include <QRegExp> #include <QThread> #include <QLabel> @@ -288,7 +288,10 @@ if ( args[i] == "-debug" ) { - log_stream.open( "log" ); + log_stream.open( + qPrintable( QDir::temp() + .absoluteFilePath( QString( "cinefx-%1.log" ) + .arg( QDateTime::currentDateTime().toString( "yyyy-MM-ddThh:mm:ss" ) ) ) ) ); Log::setLogLevel( 4 ); Log::setDestination( log_stream ); atexit( close_log ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2009-01-09 09:49:19
|
Revision: 258 http://editopia.svn.sourceforge.net/editopia/?rev=258&view=rev Author: timdewhirst Date: 2009-01-09 09:49:13 +0000 (Fri, 09 Jan 2009) Log Message: ----------- cinesuite * fix for audio becoming corrupt after loading a few files Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-08 23:35:46 UTC (rev 257) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-09 09:49:13 UTC (rev 258) @@ -599,6 +599,10 @@ m_info->update( fnames[0] ); } + // ensure the audio store is reset + m_audioStore->complete(); + m_audioStore->init(); + // setup m_jwStore->set_store_count( fnames.size() ); m_players->setPlayerCount( fnames.size() ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2009-01-20 14:57:18
|
Revision: 273 http://editopia.svn.sourceforge.net/editopia/?rev=273&view=rev Author: timdewhirst Date: 2009-01-20 14:57:14 +0000 (Tue, 20 Jan 2009) Log Message: ----------- cinesuite * make olibs log level and destination match cinesuite Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-20 14:43:21 UTC (rev 272) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-01-20 14:57:14 UTC (rev 273) @@ -88,8 +88,11 @@ // olibs #include <openpluginlib/pl/openpluginlib.hpp> #include <openpluginlib/pl/utf8_utils.hpp> +#include <openpluginlib/pl/log.hpp> #include <openimagelib/il/utility.hpp> +namespace pl = olib::openpluginlib; + static std::ofstream log_stream; void close_log() @@ -321,6 +324,10 @@ { Log::setLogLevel( 4 ); Log::setDestination( log_stream ); + + pl::Log::setLogLevel( 4 ); + pl::Log::setDestination( log_stream ); + atexit( close_log ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2009-02-05 14:09:43
|
Revision: 291 http://editopia.svn.sourceforge.net/editopia/?rev=291&view=rev Author: timdewhirst Date: 2009-02-05 14:09:40 +0000 (Thu, 05 Feb 2009) Log Message: ----------- cinesuite * fix for occasional crash when loading new media Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-02-05 10:12:05 UTC (rev 290) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2009-02-05 14:09:40 UTC (rev 291) @@ -599,20 +599,22 @@ DEBUG_LOG << qPrintable( joinedFnames ); emit LoadInputStarted( joinedFnames ); + + // stop player first + activePlayer()->stop(); // set title if ( title.isEmpty() ) title = joinedFnames; m_parent->setWindowTitle( title ); + // update info if( m_info ) { m_info->clear(); if ( fnames.size() == 1 ) m_info->update( fnames[0] ); } - - activePlayer()->stop(); // setup m_jwStore->set_store_count( fnames.size() ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |