Commit graph

7 commits

Author SHA1 Message Date
santi
2d16fb6af7 Merge branch 'sfml'
Added Singleton to AudioWidget

Conflicts:
	lms-audio.xlm
	puredata/layer_audio.pd
	src/audiolayerwidget.cpp
	src/audiolayerwidget.h
	src/audiomasterwidget.cpp
	src/audiomasterwidget.h
	src/audiomotor.cpp
	src/audiomotor.h
	src/audiowidget.cpp
	src/defines.h
	src/libremediaserver-audio.cpp
	src/libremediaserver-audio.h
	src/libremediaserver-audio.pro
	src/libremediaserver-audio.ui
	src/medialibrary.cpp
	src/medialibrary.h
	src/olathread.cpp
	src/olathread.h
	src/settings.cpp
	src/settings.h
2014-10-03 13:17:00 +02:00
santi
d7db568784 Cleaned old code. Changed the GUI refresh. Now there is a global receive
dmx instead one by layer
2014-08-13 22:51:25 +02:00
santi
90f3b093c0 Varias mejoras. Incluido settingsdialog, pero no funcional 2014-08-13 21:47:28 +02:00
santi
69ffe79742 Added a DMX watchdog. Changed the play methos, now play reset to 0 and stop not. 2014-07-12 21:53:07 +02:00
santi
a6909f8c16 Debug messages to GUI terminal 2014-07-10 17:37:52 +02:00
santi
cccd987bdd Qt5 upgrade and new audio engine based in QtMultimedia.
New GUI.
2014-07-10 01:51:29 +02:00
santi
45115830c0 Initial commit 2014-06-29 15:35:39 +02:00