LibreMediaServer/lms-audio
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'sfml'

Browse source 
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
This commit is contained in:
santi 2014-10-03 13:17:00 +02:00
commit 2d16fb6af7
31 changed files with 1112 additions and 1296 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lms-audio.xlm
View file

@ -4,8 +4,12 @@
<layer1 dmx="21" universe="1" />
<layer2 dmx="41" universe="1" />
<layer3 dmx="61" universe="1" />
<<<<<<< HEAD
<layer4 dmx="257" universe="1" />
<layer5 dmx="321" universe="1" />
<layer6 dmx="385" universe="1" />
<layer7 dmx="449" universe="1" />
=======
<layer4 dmx="81" universe="1" />
>>>>>>> sfml
</dmxSettings>