Commit Graph

97 Commits

Author SHA1 Message Date
33c6dfcd06 untested complete implementation of queuePreset(). beware of potentially introduced bugs on preset switch!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@637 6778bc44-b910-0410-a7a0-be141de4315d
2007-11-02 02:37:11 +00:00
bbe6fa7093 finished queuePreset function. now need to handle it within preset switch code
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@636 6778bc44-b910-0410-a7a0-be141de4315d
2007-11-02 02:10:56 +00:00
5e5898fae9 added playlist clear button functionality
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@635 6778bc44-b910-0410-a7a0-be141de4315d
2007-11-02 01:55:11 +00:00
f6ec80d9bd merge from dev branch (r583:HEAD)
- qprojectM lib, qprojectM-jack added
- updates to projectm engine for preset managment / callbacksO


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@630 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-28 15:39:28 +00:00
5976cdbfc6 added some top level functionality for preset insertion / selection in projectM.hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@584 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-18 01:29:54 +00:00
141b822483 projectM-iTunes-VizKit and some wmp improvements.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@568 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-12 19:44:17 +00:00
965f674284 changed most unneccessary maps to vectors
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@552 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-09 01:36:02 +00:00
72c4eece7d PCM moved out of beatdetect. Only projectM.hpp needs to be included, and even more headers removed from installation
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@530 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 17:13:12 +00:00
ead0404829 moved rendertarget and texturemanager into renderer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@527 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 16:58:07 +00:00
63082b07fb Even more refactoring of headers. Some headers are no longer necessary for implementations to include
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@526 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 16:48:16 +00:00
db6a592c68 Major projectM.hpp rearrangement. Many things made private, and deprecated stuff removed
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@525 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 16:33:42 +00:00
ce940d0cfd hard cut fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@524 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 16:07:03 +00:00
5097d9a802 more config file options
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@520 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 04:14:40 +00:00
1a02f41fd3 - moodbar cut out of projectM.hpp/cpp
- fixed compiler warning with member init list
- removed unicode support in projectm-xmms (maybe bug "fix")


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@512 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-05 00:50:31 +00:00
e06548bceb MoodBar is a resource hog
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@510 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-03 23:14:44 +00:00
82107b23cc WTF!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@508 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-03 19:18:45 +00:00
a111fd6c56 debug cleanup
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@499 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-03 03:15:00 +00:00
436fa06a25 various small updates
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@488 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-28 16:06:03 +00:00
f5ba281437 Commit of projectM-wmp and GLEW (for building on win32).
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@483 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-26 20:41:48 +00:00
027a1bde62 reactivated moodbar for now
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@473 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-22 19:43:20 +00:00
ce1af4221e modded preset chooser so random selection changes the position iterator
other very minor non behavioral changes


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@472 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-22 19:20:32 +00:00
edcd73a98c - fixed serious bug introduced with win32 compatibility
- preset name display now only shows file name, not full path



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@471 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-22 17:20:47 +00:00
afc3a4e21e successful win32 build, unran. untested. handing off to sperl
- hand wrote defines for a few standard math functions for non C99 compliant platforms
- added #ifdefs to handle glew includes
-  put some preprocessor macros and includes to project file


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@467 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-21 18:50:29 +00:00
1b1174c6a1 made default moodbar buffer 5000. results seem better
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@463 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-21 02:37:32 +00:00
5dbafa9cce mood bar updates
- added very experimental ring buffer
- new window size parameter


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@460 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-21 00:40:45 +00:00
1fffcf68f3 yay!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@454 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 02:06:50 +00:00
befafe946f more render to texture stuff
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@448 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 00:43:58 +00:00
d7657402f6 first commit of render to texture code
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@447 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 00:10:36 +00:00
d1efb37060 lots of changes
- project init / destroy memory leak bugs fixed. some still exist
- moodbar partial integration. will be removed later


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@443 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-19 21:00:58 +00:00
645c9397c0 paranoid commits, added some temp debug
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@439 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:41:50 +00:00
6e082ca305 fixed more ~projectM() issues. bugs left
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@438 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:39:43 +00:00
ddb0b1069b slowly making projectM class not depend on static crap
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@437 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:25:09 +00:00
14e127cf03 - removed some compiler warnings
- added a projectM destructor
- bug still exists when closing sometimes


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@435 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:04:08 +00:00
4e0124e64d Fix for smooth preset crashing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@431 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-16 02:33:54 +00:00
bd296571ff - removed unneccessary PROJECTM_PRESET_DIR const string
- fixed error in print out when preset dir is invalid



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@430 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:37:13 +00:00
7ef8a7b2fc oops, this one compiles
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@429 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:30:39 +00:00
a92a8d084c added paranoi to smooth preset switching regarding empty preset chooser
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@428 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:30:17 +00:00
4cf4eeae80 - merged in geiss & sperl's idle preset
- preset chooser doesn't abort when preset dir is invalid
- added smooth preset switch cancellation when preset chooser empty (untested)
- changed preset construct to allow for custom preset name when using 
	input streams as source



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@427 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 19:45:45 +00:00
85e46e522a Textured shapes == success
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@387 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 18:54:00 +00:00
cdea66aa3a PJS inital texture manager class
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@383 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 18:16:38 +00:00
63192323d0 parser refactoring
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@368 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-02 03:36:15 +00:00
f3fbb812df PJS: cleaned up interfaces
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@359 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-30 01:19:34 +00:00
43e3acf429 PJS: completed new conifg
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@358 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-29 23:39:51 +00:00
42a30734f5 PJS: moving to configfile c++ library
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@353 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-28 19:17:43 +00:00
88a75c148a carms changes from tonight
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@350 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-21 05:17:20 +00:00
ac354b8fdd forgot--This line, and those below, will be ignored--
M    projectM-engine/projectM.cpp


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@346 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:52:11 +00:00
807da7fe56 switch preset name when smooth switching
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@345 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:46:40 +00:00
e0e7c30ab8 fixed preset name display on my dist at least
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@342 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:22:25 +00:00
e210bf1903 sigmoid interpolation attempted, but for some confusing reason didnt look as good at linear interpolation
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@341 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:57:05 +00:00
4b65ccefef - updated config.1.00.in to new config format
- put back preset url behavior


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@340 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:42:37 +00:00