mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-24 01:35:51 +00:00
Code Issues Projects Releases Wiki Activity

texture size read / write bug fix

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@929 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-03-31 01:28:51 +00:00
parent a57dd65f56
commit c88a9ebfcd
5 changed files with 31 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
projectMTrunk.kdevelop
View File

@ -10,16 +10,16 @@
<projectname>projectMTrunk</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description></description>
<defaultencoding></defaultencoding>
<description/>
<defaultencoding/>
<versioncontrol/>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<mainprogram>/home/carm/projects/projectM/trunk/src/projectM-pulseaudio/projectM-pulseaudio</mainprogram>
<programargs></programargs>
<globaldebugarguments></globaldebugarguments>
<programargs/>
<globaldebugarguments/>
<globalcwd>/home/carm/projects/projectM/trunk/src/</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>false</terminal>
@ -51,9 +51,9 @@
</build>
<other>
<prio>0</prio>
<otherbin></otherbin>
<defaulttarget></defaulttarget>
<otheroptions></otheroptions>
<otherbin/>
<defaulttarget/>
<otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -64,9 +64,9 @@
<numberofjobs>2</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
<makebin></makebin>
<defaulttarget></defaulttarget>
<makeoptions></makeoptions>
<makebin/>
<defaulttarget/>
<makeoptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -75,11 +75,11 @@
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell></dbgshell>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<dbgshell/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@ -180,7 +180,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
<prefixGet></prefixGet>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>

5
projectMTrunk.kdevelop.filelist
View File

@ -969,8 +969,3 @@ src/projectM-xmms/main.cpp
src/projectM-xmms/sdltoprojectM.h
src/projectM-xmms/video_init.cpp
src/projectM-xmms/video_init.h
src/qprojectM-jack
src/qprojectM-jack/CMakeLists.txt
src/qprojectM-jack/ConfigFile.cpp
src/qprojectM-jack/ConfigFile.h
src/qprojectM-jack/Makefile

BIN
projectMTrunk.kdevelop.pcs
View File

Binary file not shown.

76
projectMTrunk.kdevses
View File

@ -1,79 +1,31 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="24" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qpreseteditordialog.cpp" >
<DocsAndViews NumberOfDocuments="8" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/RandomNumberGenerators.hpp" >
<View0 Encoding="" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectm_mainwindow.cpp" >
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/CMakeLists.txt" >
<View0 Encoding="" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectm_mainwindow.hpp" >
<View0 Encoding="" Type="Source" />
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<View0 Encoding="" line="168" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectmconfigdialog.cpp" >
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/PCM.cpp" >
<View0 Encoding="" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qpresettextedit.cpp" >
<View0 Encoding="" Type="Source" />
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.hpp" >
<View0 Encoding="" line="65" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qplaylisttableview.hpp" >
<View0 Encoding="" line="0" Type="Source" />
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.cpp" >
<View0 Encoding="" line="297" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qpreseteditordialog.hpp" >
<View0 Encoding="ISO 8859-1" Type="Source" />
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qxmlplaylisthandler.hpp" >
<View0 Encoding="" line="86" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qpresettextedit.hpp" >
<View0 Encoding="" Type="Source" />
<Doc7 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.hpp" >
<View0 Encoding="" line="140" Type="Source" />
</Doc7>
<Doc8 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/RandomNumberGenerators.hpp" >
<View0 Encoding="" Type="Source" />
</Doc8>
<Doc9 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qplaylistfiledialog.cpp" >
<View0 Encoding="" Type="Source" />
</Doc9>
<Doc10 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qplaylistmodel.cpp" >
<View0 Encoding="" line="69" Type="Source" />
</Doc10>
<Doc11 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/qprojectM-pulseaudio.cpp" >
<View0 Encoding="" line="120" Type="Source" />
</Doc11>
<Doc12 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/QPulseAudioThread.cpp" >
<View0 Encoding="" Type="Source" />
</Doc12>
<Doc13 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/CMakeLists.txt" >
<View0 Encoding="" Type="Source" />
</Doc13>
<Doc14 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/CMakeLists.txt" >
<View0 Encoding="" Type="Source" />
</Doc14>
<Doc15 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qplaylistmodel.hpp" >
<View0 Encoding="" line="95" Type="Source" />
</Doc15>
<Doc16 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<View0 Encoding="" Type="Source" />
</Doc16>
<Doc17 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/PCM.cpp" >
<View0 Encoding="" Type="Source" />
</Doc17>
<Doc18 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectmconfigdialog.hpp" >
<View0 Encoding="" Type="Source" />
</Doc18>
<Doc19 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/QPulseAudioThread.hpp" >
<View0 Encoding="" Type="Source" />
</Doc19>
<Doc20 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectm.hpp" >
<View0 Encoding="" line="33" Type="Source" />
</Doc20>
<Doc21 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM-jack/qprojectM-jack.cpp" >
<View0 Encoding="" Type="Source" />
</Doc21>
<Doc22 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qprojectmwidget.hpp" >
<View0 Encoding="" Type="Source" />
</Doc22>
<Doc23 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/qprojectM/qplaylistfiledialog.hpp" >
<View0 Encoding="" line="162" Type="Source" />
</Doc23>
</DocsAndViews>
<pluginList>
<kdevdebugger>

2
src/projectM-engine/projectM.cpp
View File

@ -166,7 +166,7 @@ void projectM::readConfig (const std::string & configFile )
_settings.meshX = config.read<int> ( "Mesh X", 32 );
_settings.meshY = config.read<int> ( "Mesh Y", 24 );
_settings.textureSize = config.read<int> ( "Texsize", 512 );
_settings.textureSize = config.read<int> ( "Texture Size", 512 );
_settings.fps = config.read<int> ( "FPS", 35 );
_settings.windowWidth = config.read<int> ( "Window Width", 512 );
_settings.windowHeight = config.read<int> ( "Window Height", 512 );