2d16fb6af7
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
15 lines
479 B
XML
15 lines
479 B
XML
<?xml version='1.0' encoding='UTF-8'?>
|
|
<dmxSettings fileVersion="1" layersNumber="3" path="/home/santi/audio" universeNumber="1">
|
|
<layer0 dmx="1" universe="1" />
|
|
<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>
|