Commit Graph

1302 Commits

Author SHA1 Message Date
c4eacc01da enable linking of CoreFoundation and openGL on OSX 2013-08-11 19:49:20 -07:00
9c54067c38 Merge ../projectm-sonic74 2013-02-01 21:48:12 -05:00
2dd474746e fix compiler warning 2013-02-01 21:47:42 -05:00
3d85aea13e A web service to remotely control the presets over HTTP from e.g. a smartphone. Screenshot:
http://sven.killig.de/projectM/HTTPRemoteControl.png

Usage:
[HTTP_PORT=<HTTP port> [HTTP_NAME=<HTML title>]] ./projectM-jack

Requires LibQxt. Unfortunately, cmake doesn't come with a FindQxt.cmake yet. I modified the one available at
http://dev.libqxt.org/libqxt/src
in the folder "features" to work with Ubuntu 12.10:
http://sven.killig.de/projectM/FindQxt.cmake
Put it to /usr/share/cmake-2.8/Modules

I first tried to start my web service in projectM-qt, but somehow it didn't work, so for now it's only available in projectM-jack. Perhaps someone more experienced with Q[x]t can fix this.
2013-01-21 22:06:48 +01:00
acc0cf1bb7 Merge branch 'preset-factory-error-handling' 2012-11-16 23:10:18 -05:00
61404d0777 better error message for file io issues 2012-11-16 23:09:34 -05:00
c4c7dce85c handle presetSwitchFailedEvent in projectM-qt (then android later) 2012-11-14 11:13:54 -05:00
2c6c6fef62 more logical fix to bug by using exist left / right args
e Please enter the commit message for your changes. Lines starting
2012-11-13 23:47:06 -05:00
2d1b7c6d3d safe guard against expressions like x = 2*sin(bas)+5* 2012-11-13 23:26:35 -05:00
b87f1ad8a3 encapsulate factory/preset alloc in one method.
throw typed exception in allocate()
2012-11-11 23:11:21 -05:00
a52df7331c fix to CMakeLists.txt (kudos to lydia) 2012-10-15 21:17:43 -04:00
b1bf163bce Remove old 3rd-party source-code and binaries
Cleanup the code tree :-)


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1406 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-21 17:16:40 +00:00
eac61fdd90 version bump projectM test
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1405 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:21:13 +00:00
44d1b2f9a0 version bump libvisual alsa
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1404 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:20:17 +00:00
8f15c59fc8 projecTM jack version bump
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1403 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:19:39 +00:00
0977ab3eca version bump
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1402 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:18:33 +00:00
776f366b39 more version bumps
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1401 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:17:10 +00:00
7c5ec60d92 bump version number
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1400 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:09:51 +00:00
bbaa26d3aa Suppress cmake policy warning
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1399 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:05:59 +00:00
e6564116fa change projectM version in libprojectM CMakeLists
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1398 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 16:01:25 +00:00
c2104126e4 update version to 2.1.0
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1397 6778bc44-b910-0410-a7a0-be141de4315d
2012-05-19 15:47:56 +00:00
b2c0fcd7bb Add possibility to use system fonts & fix font-loading bug in renderer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1396 6778bc44-b910-0410-a7a0-be141de4315d
2012-04-14 14:26:11 +00:00
e8734303a1 trivial: Set correct projectM version in libprojectM.pc
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1395 6778bc44-b910-0410-a7a0-be141de4315d
2012-04-04 09:35:01 +00:00
ace5e5e7fe Allow to render to a texture through its own fbo
WHEN NOT using this "projectM::renderToTexture":
projectM now also handles the case where the user is using its own couple texture/fbo rendering.

Thanks to Julien Isorce for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1394 6778bc44-b910-0410-a7a0-be141de4315d
2012-04-03 21:48:25 +00:00
12a658291b disable N-ary stuff due to bug
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1393 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-27 04:43:23 +00:00
ea024727cf typo
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1392 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-27 04:30:42 +00:00
43fde4a6dd N-ary print function
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1391 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-27 04:27:33 +00:00
001e306791 return what you're printing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1390 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-27 04:16:31 +00:00
8f958ed0eb print function
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1389 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-27 03:19:42 +00:00
e8fffabeb8 fix build regressions when building from project root
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1388 6778bc44-b910-0410-a7a0-be141de4315d
2012-03-26 02:25:31 +00:00
cba34ec7f3 free gen_expr upon per pixel destroy
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1387 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-31 03:24:17 +00:00
0023eb77f8 memory leak fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1386 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-31 02:06:21 +00:00
cbf76cca44 Fix projectM in-tree build
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1385 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-17 23:25:07 +00:00
855aba5ebc Some more cmake changes to do version changes easier.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1384 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 22:18:56 +00:00
9ea976c39e trivial: Fix some of the native presents (use PixelPoint)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1383 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:36:01 +00:00
87e1863b97 Fix compilation on Windows
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1382 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:31:03 +00:00
6e7860f6fa core: Fix compilation on MacOS
Thanks to Clementine devs for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1381 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:07:42 +00:00
562700a643 core: Fix crash on Windows
Thanks to Clementine devs for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1380 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:06:13 +00:00
f4306c0cd0 core: Fix FBO fallback memleak
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1379 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:03:53 +00:00
62627138ab trivial: More cmake magic
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1378 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:01:37 +00:00
acb200345b renderer: Improve font error-handling
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1377 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 18:35:53 +00:00
48fe89fb2a Add manpages for projectM tools
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1376 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 17:32:52 +00:00
7e16fbccec Again some linking order fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1375 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 16:38:06 +00:00
b12ca1e02d Remove more unused headers
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1374 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 16:25:13 +00:00
210a317690 pmjack: Don't start/restart JACK transport clock
Thanks to h3xx for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1373 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 16:22:23 +00:00
2f816c182e Fix remaining cmake warnings
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1372 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-03 18:27:14 +00:00
f5ebce9a74 Configure files in binary build directory
Makes out-of-tree-build much nicer :)


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1371 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-03 18:11:26 +00:00
699579be83 Make it possible for Qt4 apps to throw exceptions from slots
This fixes the Qt4 warnings if an exception is thrown
in an event handler.


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1370 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-03 18:06:29 +00:00
fef203c3fb trivial: Cleanup cmake
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1369 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-03 17:51:58 +00:00
36a13b163f Fix projectM build process
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1368 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-01 19:04:00 +00:00