change "programms" folder to "modules"

src/Lichtsteuerung.pro

@@ -42,20 +42,20 @@ SOURCES += \
     gui/polygon.cpp \
     dmx/programm.cpp \
     dmx/programmprototype.cpp \
-    programms/dmxconsumer.cpp \
+    modules/dmxconsumer.cpp \
     scanner.cpp \
     test/testloopprogramm.cpp \
     settings.cpp \
     test/DriverDummy.cpp \
     usermanagment.cpp \
-    programms/modulemanager.cpp \
-    programms/programblock.cpp \
-    programms/compiler.cpp \
+    modules/modulemanager.cpp \
+    modules/programblock.cpp \
+    modules/compiler.cpp \
     test/testmodulsystem.cpp \
-    programms/controller.cpp \
-    programms/dmxprogram.cpp \
-    programms/dmxprogramblock.cpp \
-    programms/json_storage.cpp \
+    modules/controller.cpp \
+    modules/dmxprogram.cpp \
+    modules/dmxprogramblock.cpp \
+    modules/json_storage.cpp \
     codeeditorhelper.cpp \
     test/testmodulecontroller.cpp \
     test/testprogrammblock.cpp \
@@ -63,7 +63,7 @@ SOURCES += \
     audio/sample.cpp \
     test/testsampleclass.cpp \
     audio/audiocapturemanager.cpp \
-    programms/boostloopprogramcontextswitcher.cpp \
+    modules/boostloopprogramcontextswitcher.cpp \
     spotify/spotify.cpp \
     spotify/currentplayingobject.cpp \
     spotify/trackobject.cpp \
@@ -101,8 +101,8 @@ HEADERS += \
     applicationdata.h \
     dmx/namedobject.h \
     dmx/dmxchannelfilter.h \
-    programms/controlpoint.hpp \
-    programms/scanner.hpp \
+    modules/controlpoint.hpp \
+    modules/scanner.hpp \
     scanner.h \
     usermanagment.h \
     gui/channelprogrammeditor.h \
@@ -123,33 +123,33 @@ HEADERS += \
     gui/colorplot.h \
     gui/graph.h \
     gui/oscillogram.h \
-    programms/types.h \
-    programms/dmxconsumer.h \
-    programms/module.h \
+    modules/types.h \
+    modules/dmxconsumer.h \
+    modules/module.h \
     test/testloopprogramm.h \
-    programms/modulemanager.h \
-    programms/programblock.h \
-    programms/property.hpp \
-    programms/filter.hpp \
-    programms/consumer.hpp \
-    programms/compiler.h \
+    modules/modulemanager.h \
+    modules/programblock.h \
+    modules/property.hpp \
+    modules/filter.hpp \
+    modules/consumer.hpp \
+    modules/compiler.h \
     test/testmodulsystem.h \
-    programms/controller.h \
-    programms/dmxprogram.h \
-    programms/dmxprogramblock.h \
-    programms/storage.hpp \
-    programms/json_storage.h \
+    modules/controller.h \
+    modules/dmxprogram.h \
+    modules/dmxprogramblock.h \
+    modules/storage.hpp \
+    modules/json_storage.h \
     codeeditorhelper.h \
-    programms/program.hpp \
+    modules/program.hpp \
     test/testmodulecontroller.h \
     test/testprogrammblock.h \
     gui/programblockeditor.h \
     audio/sample.h \
     test/testsampleclass.h \
     audio/audiocapturemanager.h \
-    programms/fftoutput.hpp \
-    programms/loopprogram.hpp \
-    programms/boostloopprogramcontextswitcher.h \
+    modules/fftoutput.hpp \
+    modules/loopprogram.hpp \
+    modules/boostloopprogramcontextswitcher.h \
     spotify/spotify.h \
     spotify/currentplayingobject.h \
     spotify/trackobject.h \
@@ -163,8 +163,8 @@ HEADERS += \
     spotify/audioanalysisobject.h \
     spotify/userobject.h \
     spotify/util.h \
-    programms/spotifyobjetcs.hpp \
-    programms/spotify.hpp \
+    modules/spotifyobjetcs.hpp \
+    modules/spotify.hpp \
     sortedmodelview.h
 
 

src/applicationdata.cpp

@@ -12,8 +12,8 @@
 #include "gui/controlpanel.h"
 #include "gui/mapview.h"
 #include <QCryptographicHash>
-#include "programms/modulemanager.h"
-#include "programms/programblock.h"
+#include "modules/modulemanager.h"
+#include "modules/programblock.h"
 #include "spotify/spotify.h"
 
 namespace ApplicationData{

src/codeeditorhelper.cpp

@@ -2,7 +2,7 @@
 #include <QTextCursor>
 #include <QtQuick>
 #include "settings.h"
-#include "programms/compiler.h"
+#include "modules/compiler.h"
 
 QString toName(Modules::Module::Type t){
     switch (t) {

src/codeeditorhelper.h

@@ -6,7 +6,7 @@
 #include <QSyntaxHighlighter>
 #include <QTextCharFormat>
 #include <QRegularExpression>
-#include <programms/modulemanager.h>
+#include "modules/modulemanager.h"
 #include <QSortFilterProxyModel>
 
 // Highlight code from https://doc.qt.io/qt-5/qtwidgets-richtext-syntaxhighlighter-example.html

src/dmx/driver.cpp

@@ -6,7 +6,7 @@
 #include "dmxchannelfilter.h"
 #include <QDir>
 #include <cstring>
-#include "programms/dmxconsumer.h"
+#include "modules/dmxconsumer.h"
 
 //#define LOG_DRIVER
 
@@ -188,6 +188,7 @@ namespace Driver {
             if(driver){
                 driver->stop();
                 delete driver;
+                driver = nullptr;
             }
             driver=inter;
             return true;
@@ -214,6 +215,7 @@ namespace Driver {
         if (driver) {
             driver->stop();
             delete driver;
+            driver = nullptr;
         }
     }
 }

src/gui/controlitemdata.h

@@ -4,7 +4,7 @@
 #include <QObject>
 #include "dmx/programm.h"
 #include "dmx/device.h"
-#include "programms/programblock.h"
+#include "modules/programblock.h"
 
 namespace GUI{
 

src/gui/controlpanel.h

@@ -3,7 +3,7 @@
 
 #include <QQuickItem>
 #include "dmx/programm.h"
-#include "programms/programblock.h"
+#include "modules/programblock.h"
 #include "controlitemdata.h"
 
 namespace GUI{

src/gui/mapview.h

@@ -5,7 +5,7 @@
 #include "gridbackground.h"
 #include <iostream>
 #include "scanner.h"
-#include "programms/modulemanager.h"
+#include "modules/modulemanager.h"
 
 namespace GUI{
 

src/gui/programblockeditor.cpp

 #include "programblockeditor.h"
 #include <QQmlEngine>
 #include <QPropertyAnimation>
-#include "programms/property.hpp"
+#include "modules/property.hpp"
 #include "errornotifier.h"
 
 QQmlEngine*  GUI::ProgramBlockEditor::engine = nullptr;

src/gui/programblockeditor.h

@@ -2,8 +2,8 @@
 #define PROGRAMBLOCKEDITOR_H
 
 #include <QQuickItem>
-#include "programms/programblock.h"
-#include "programms/modulemanager.h"
+#include "modules/programblock.h"
+#include "modules/modulemanager.h"
 #include <QStringListModel>
 
 namespace GUI{

src/main.cpp

@@ -34,7 +34,7 @@
 #include "test/testloopprogramm.h"
 #include "test/testmodulsystem.h"
 #include "codeeditorhelper.h"
-#include "programms/programblock.h"
+#include "modules/programblock.h"
 #include "gui/programblockeditor.h"
 #include "gui/graph.h"
 #include <QTimer>
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
     driver.setSetValuesCallback([](unsigned char* values, int size, double time){
         std::memset(values,0,size);
         DMXChannelFilter::initValues(values,size);
-        Programm::fill(values,size,time);
+        DMX::Programm::fill(values,size,time);
         Modules::DMXConsumer::fillWithDMXConsumer(values,size);
         DMXChannelFilter::filterValues(values,size);
         Driver::dmxValueModel.setValues(values,size);

src/modelmanager.h

@@ -5,7 +5,7 @@
 #include "dmx/device.h"
 #include "dmx/programm.h"
 #include "dmx/programmprototype.h"
-#include "programms/modulemanager.h"
+#include "modules/modulemanager.h"
 #include "settings.h"
 #include <QObject>