# HG changeset patch
# User lbajardsilogic
# Date 1194975911 0
# Node ID 69061754408f5fec9b4a95e6b077e954ab0766c9
# Parent e63e8272dcb00a3dddf3ea270515b64d4771881b
enable to load video file from the server
diff -r e63e8272dcb0 -r 69061754408f data/svdata.vcproj
--- a/data/svdata.vcproj Tue Nov 13 17:23:53 2007 +0000
+++ b/data/svdata.vcproj Tue Nov 13 17:45:11 2007 +0000
@@ -322,6 +322,10 @@
>
+
+
@@ -451,6 +455,10 @@
>
+
+
diff -r e63e8272dcb0 -r 69061754408f sv/main/EasaierSessionManager.cpp
--- a/sv/main/EasaierSessionManager.cpp Tue Nov 13 17:23:53 2007 +0000
+++ b/sv/main/EasaierSessionManager.cpp Tue Nov 13 17:45:11 2007 +0000
@@ -31,6 +31,7 @@
#include "data/fileio/QueryConfigReader.h"
#include "data/fileio/SparqlResultsReader.h"
#include "data/fileio/SparqlRelatedMediaReader.h"
+#include "data/fileio/VideoFileReaderFactory.h"
#include "data/model/WaveFileModel.h"
#include "main/MainWindow.h"
#include "widgets/QueryResultsWidget.h"
@@ -382,6 +383,9 @@
m_document->setMainModel(model);
addedModel[modelName] = (Model* ) model;
ok = true;
+ } else if (VideoFileReaderFactory::isKnownExtensions(extension))
+ {
+ ok = !(MainWindow::instance()->openVideoFile(filename, MainWindow::AudioFileOpenMode::ReplaceMainModel));
} else
{
ModelReader modelReader(m_document, layer);
diff -r e63e8272dcb0 -r 69061754408f sv/main/MainWindow.cpp
--- a/sv/main/MainWindow.cpp Tue Nov 13 17:23:53 2007 +0000
+++ b/sv/main/MainWindow.cpp Tue Nov 13 17:45:11 2007 +0000
@@ -2339,8 +2339,6 @@
QString path = getOpenFileName(FileFinder::VideoFile);
//TODO : find a better way to fix the widget video bug.
- m_qtabwidget->setCurrentIndex(Video);
-
if (path != "") {
if (openVideoFile(path, ReplaceMainModel) == FileOpenFailed) {
QMessageBox::critical(this, tr("Failed to open file"),
@@ -2618,6 +2616,8 @@
MainWindow::FileOpenStatus
MainWindow::openVideoFile(QString path, AudioFileOpenMode mode)
{
+ m_qtabwidget->setCurrentIndex(Video);
+
return openAudioFile(path, path, mode);
}
//
diff -r e63e8272dcb0 -r 69061754408f sv/sound_access.vcproj
--- a/sv/sound_access.vcproj Tue Nov 13 17:23:53 2007 +0000
+++ b/sv/sound_access.vcproj Tue Nov 13 17:45:11 2007 +0000
@@ -137,7 +137,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="-Zm200 -EHsc"
Optimization="0"
- AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;..;audioio;videoio;document;transform;osc;filter;main;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsamplerate\libsamplerate-0.1.2\src";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2";"$(EASAIER_UTILS_DIR)\portaudio\portaudio_v18_1\pa_common";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\SDL-1.2.12\include";"$(EASAIER_UTILS_DIR)\ffmpeg\include""
+ AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;..;../data;audioio;videoio;document;transform;osc;filter;main;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsamplerate\libsamplerate-0.1.2\src";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2";"$(EASAIER_UTILS_DIR)\portaudio\portaudio_v18_1\pa_common";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\SDL-1.2.12\include";"$(EASAIER_UTILS_DIR)\ffmpeg\include""
PreprocessorDefinitions="BUILD_DEBUG;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;SDL_FFMPEG_LIBRARY;QT_THREAD_SUPPORT;QT_DLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES"
GeneratePreprocessedFile="0"
MinimalRebuild="false"