# HG changeset patch
# User lbajardsilogic
# Date 1179148315 0
# Node ID e59b19407b6dabc56601cefba93a2f7b487b74b6
# Parent  21f452cc33104e566c76cd3dea8f5370e95a03cd
add
- EasaierSessionManager
- Easaier menus
- Interval model

diff -r 21f452cc3310 -r e59b19407b6d data/data.pro
--- a/data/data.pro	Mon May 14 13:11:29 2007 +0000
+++ b/data/data.pro	Mon May 14 13:11:55 2007 +0000
@@ -37,6 +37,10 @@
            fileio/WavFileReader.h \
            fileio/WavFileWriter.h \
            fileio/HttpClient.h \
+           fileio/AudioSourceInfoReader.h \
+           fileio/ModelReader.h \
+           fileio/QueryConfigReader.h \
+           fileio/SparqlResultsReader.h \
            model/DenseThreeDimensionalModel.h \
            model/DenseTimeValueModel.h \
            model/EditableDenseThreeDimensionalModel.h \
@@ -54,7 +58,8 @@
            model/WaveFileModel.h \
            model/WritableWaveFileModel.h \
            model/AudioSourceInfoModel.h \
-           model/QueryModel.h
+           model/QueryModel.h \
+           model/IntervalModel.h
 SOURCES += fft/FFTapi.cpp \
            fft/FFTDataServer.cpp \
            fft/FFTFileCache.cpp \
@@ -76,6 +81,10 @@
            fileio/WavFileReader.cpp \
            fileio/WavFileWriter.cpp \
            fileio/HttpClient.cpp \
+           fileio/AudioSourceInfoReader.cpp \
+           fileio/ModelReader.cpp \
+           fileio/QueryConfigReader.cpp \
+           fileio/SparqlResultsReader.cpp \
            model/DenseTimeValueModel.cpp \
            model/EditableDenseThreeDimensionalModel.cpp \
            model/FFTModel.cpp \
@@ -86,4 +95,5 @@
            model/WaveFileModel.cpp \
            model/WritableWaveFileModel.cpp \
            model/AudioSourceInfoModel.cpp \
-           model/QueryModel.cpp
+           model/QueryModel.cpp \
+           model/IntervalModel.cpp
diff -r 21f452cc3310 -r e59b19407b6d data/svdata.vcproj
--- a/data/svdata.vcproj	Mon May 14 13:11:29 2007 +0000
+++ b/data/svdata.vcproj	Mon May 14 13:11:55 2007 +0000
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -EHsc"
 				Optimization="2"
-				AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;fft;model;fileio;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\libogg\libogg-1.1.3\include";"$(EASAIER_UTILS_DIR)\liboggz\liboggz-0.9.5\include";"$(EASAIER_UTILS_DIR)\libfishsound\libfishsound-0.7.0\include";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2""
+				AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;fft;model;../sv;fileio;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\libogg\libogg-1.1.3\include";"$(EASAIER_UTILS_DIR)\liboggz\liboggz-0.9.5\include";"$(EASAIER_UTILS_DIR)\libfishsound\libfishsound-0.7.0\include";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2""
 				PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;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;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="false"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -EHsc"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;fft;model;fileio;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\libogg\libogg-1.1.3\include";"$(EASAIER_UTILS_DIR)\liboggz\liboggz-0.9.5\include";"$(EASAIER_UTILS_DIR)\libfishsound\libfishsound-0.7.0\include";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2""
+				AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;fft;model;fileio;../sv;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\libogg\libogg-1.1.3\include";"$(EASAIER_UTILS_DIR)\liboggz\liboggz-0.9.5\include";"$(EASAIER_UTILS_DIR)\libfishsound\libfishsound-0.7.0\include";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2""
 				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;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"
@@ -186,6 +186,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\AudioSourceInfoReader.cpp"
+				>
+			</File>
+			<File
 				RelativePath="fileio\BZipFileDevice.cpp"
 				>
 			</File>
@@ -246,6 +250,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\model\IntervalModel.cpp"
+				>
+			</File>
+			<File
 				RelativePath="fileio\MatrixFile.cpp"
 				>
 			</File>
@@ -258,6 +266,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\ModelReader.cpp"
+				>
+			</File>
+			<File
 				RelativePath="fileio\MP3FileReader.cpp"
 				>
 			</File>
@@ -278,6 +290,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\QueryConfigReader.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\model\QueryModel.cpp"
 				>
 			</File>
@@ -286,6 +302,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\SparqlResultsReader.cpp"
+				>
+			</File>
+			<File
 				RelativePath="model\WaveFileModel.cpp"
 				>
 			</File>
@@ -315,6 +335,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\AudioSourceInfoReader.h"
+				>
+			</File>
+			<File
 				RelativePath="fileio\CodedAudioFileReader.h"
 				>
 			</File>
@@ -347,6 +371,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\model\IntervalModel.h"
+				>
+			</File>
+			<File
+				RelativePath=".\fileio\ModelReader.h"
+				>
+			</File>
+			<File
 				RelativePath="fileio\MP3FileReader.h"
 				>
 			</File>
@@ -367,6 +399,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\fileio\QueryConfigReader.h"
+				>
+			</File>
+			<File
+				RelativePath=".\fileio\SparqlResultsReader.h"
+				>
+			</File>
+			<File
 				RelativePath="model\SparseModel.h"
 				>
 			</File>
@@ -666,7 +706,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="MOC $(InputFileName)"
-							CommandLine="$(QTDIR)\bin\moc.exe -DNDEBUG -DBUILD_RELEASE -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB  -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include&quot; -I &quot;.&quot; -I &quot;fft&quot; -I &quot;model&quot; -I &quot;fileio&quot; -I &quot;..&quot; -I &quot;$(QTDIR)\include\ActiveQt&quot; -I &quot;tmp_moc&quot; -I &quot;.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot; $(InputPath) -o tmp_moc\moc_$(InputName).cpp"
+							CommandLine="$(QTDIR)\bin\moc.exe -DNDEBUG -DBUILD_RELEASE -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB  -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include&quot; -I &quot;.&quot; -I &quot;fft&quot; -I &quot;model&quot; -I &quot;fileio&quot; -I &quot;..&quot; -I &quot;$(QTDIR)\include\ActiveQt&quot; -I &quot;tmp_moc&quot; -I &quot;.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot; $(InputPath) -o tmp_moc\moc_$(InputName).cpp&#x0D;&#x0A;"
 							AdditionalDependencies="$(QTDIR)\bin\moc.exe"
 							Outputs="tmp_moc\moc_$(InputName).cpp"
 						/>
@@ -677,7 +717,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="MOC $(InputFileName)"
-							CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB  -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include&quot; -I &quot;.&quot; -I &quot;fft&quot; -I &quot;model&quot; -I &quot;fileio&quot; -I &quot;..&quot; -I &quot;$(QTDIR)\include\ActiveQt&quot; -I &quot;tmp_moc&quot; -I &quot;.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot; $(InputPath) -o tmp_moc\moc_$(InputName).cpp"
+							CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB  -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtCore&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtNetwork&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include\QtGui&quot; -I &quot;$(QTDIR)\include&quot; -I &quot;.&quot; -I &quot;fft&quot; -I &quot;model&quot; -I &quot;fileio&quot; -I &quot;..&quot; -I &quot;$(QTDIR)\include\ActiveQt&quot; -I &quot;tmp_moc&quot; -I &quot;.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005&quot; $(InputPath) -o tmp_moc\moc_$(InputName).cpp&#x0D;&#x0A;"
 							AdditionalDependencies="$(QTDIR)\bin\moc.exe"
 							Outputs="tmp_moc\moc_$(InputName).cpp"
 						/>