renamed outputstreamhandler

Stykk-Gruppen · Aug 1, 2020 · a5ffd65 · a5ffd65
1 parent ece0fa4
commit a5ffd65
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 41 deletions.
diff --git a/components/TaskBar.qml b/components/TaskBar.qml
@@ -144,6 +144,7 @@ Rectangle {
             property var toggled: true
             onClicked: {
                 //streamHandler.stopRecording();
+                //TODO handle return value?
                 sessionHandler.leaveSession();
                 changePage("home");
             }

diff --git a/handlers/inputstreamhandler.cpp b/handlers/inputstreamhandler.cpp
@@ -169,7 +169,7 @@ void InputStreamHandler::addStreamToVector(int index, QString streamId, QString
     mAudioPlaybackStartedVector.push_back(false);
     mVideoPlaybackStartedVector.push_back(false);
 
-    //Your own image is at 0, so we add 1 here and in videoPlayback constructor
+    //Your own image is at 0, but index 0 in the vectors is NOT you.
     mImageHandler->addPeer((index + 1), displayName);
 }
 

diff --git a/handlers/streamhandler.cpp → handlers/outputstreamhandler.cpp b/handlers/streamhandler.cpp → handlers/outputstreamhandler.cpp
@@ -1,7 +1,7 @@
-#include "streamhandler.h"
+#include "outputstreamhandler.h"
 
 
-StreamHandler::StreamHandler(ImageHandler* _imageHandler, UdpSocketHandler* _socketHandler, int bufferSize, Settings* settings, TcpSocketHandler* tcpSocketHandler,  QObject *parent) : QObject(parent)
+OutputStreamHandler::OutputStreamHandler(ImageHandler* _imageHandler, UdpSocketHandler* _socketHandler, int bufferSize, Settings* settings, TcpSocketHandler* tcpSocketHandler,  QObject *parent) : QObject(parent)
 {
     mSettings = settings;
     mBufferSize = bufferSize;
@@ -18,7 +18,7 @@ StreamHandler::StreamHandler(ImageHandler* _imageHandler, UdpSocketHandler* _soc
     }
 }
 
-void StreamHandler::init()
+void OutputStreamHandler::init()
 {
     mVideoEnabled = mSettings->getVideoOn();
     mAudioEnabled = mSettings->getAudioOn();
@@ -51,7 +51,7 @@ void StreamHandler::init()
     }
 }
 
-void StreamHandler::close()
+void OutputStreamHandler::close()
 {
     qDebug() << "Closing streamHandler";
 
@@ -85,7 +85,7 @@ void StreamHandler::close()
 
 
 
-void StreamHandler::grabVideoHeader()
+void OutputStreamHandler::grabVideoHeader()
 {
     if(mVideoHandler == nullptr)
     {
@@ -103,7 +103,7 @@ void StreamHandler::grabVideoHeader()
     mVideoHandler = nullptr;
 }
 
-int StreamHandler::enableAudio()
+int OutputStreamHandler::enableAudio()
 {
     mAudioEnabled = true;
     qDebug() << "enabling audio";
@@ -130,7 +130,7 @@ int StreamHandler::enableAudio()
     return 0;
 }
 
-void StreamHandler::disableAudio()
+void OutputStreamHandler::disableAudio()
 {
     if(mAudioHandler != nullptr)
     {
@@ -141,7 +141,7 @@ void StreamHandler::disableAudio()
     }
 }
 
-int StreamHandler::enableVideo()
+int OutputStreamHandler::enableVideo()
 {
     mVideoEnabled = true;
     qDebug() << "enabling video";
@@ -170,7 +170,7 @@ int StreamHandler::enableVideo()
     return 0;
 }
 
-void StreamHandler::disableVideo()
+void OutputStreamHandler::disableVideo()
 {
     if(mVideoHandler != nullptr)
     {
@@ -181,12 +181,12 @@ void StreamHandler::disableVideo()
     }
 }
 
-QVariantList StreamHandler::getAudioInputDevices()
+QVariantList OutputStreamHandler::getAudioInputDevices()
 {
     return mAudioHandler->getAudioInputDevices();
 }
 
-void StreamHandler::changeAudioInputDevice(QString deviceName)
+void OutputStreamHandler::changeAudioInputDevice(QString deviceName)
 {
     qDebug() << "Changing Audio to: " << deviceName;
     mAudioDevice = deviceName;
@@ -195,17 +195,17 @@ void StreamHandler::changeAudioInputDevice(QString deviceName)
     enableAudio();
 }
 
-QString StreamHandler::getDefaultAudioInputDevice()
+QString OutputStreamHandler::getDefaultAudioInputDevice()
 {
     return "default";
 }
 
-bool StreamHandler::checkVideoEnabled()
+bool OutputStreamHandler::checkVideoEnabled()
 {
     return mVideoEnabled;
 }
 
-bool StreamHandler::checkAudioEnabled()
+bool OutputStreamHandler::checkAudioEnabled()
 {
     return mAudioEnabled;
 }
diff --git a/handlers/streamhandler.h → handlers/outputstreamhandler.h b/handlers/streamhandler.h → handlers/outputstreamhandler.h
@@ -8,11 +8,11 @@
 #include "settings.h"
 #include "handlers/errorhandler.h"
 
-class StreamHandler : public QObject
+class OutputStreamHandler : public QObject
 {
     Q_OBJECT
 public:
-    StreamHandler(ImageHandler* _imageHandler, UdpSocketHandler* _socketHandler, int buffer_size, Settings* settings, TcpSocketHandler* tcpSocketHandler, QObject *parent = nullptr);
+    OutputStreamHandler(ImageHandler* _imageHandler, UdpSocketHandler* _socketHandler, int buffer_size, Settings* settings, TcpSocketHandler* tcpSocketHandler, QObject *parent = nullptr);
     VideoHandler* mVideoHandler = nullptr;
     AudioHandler* mAudioHandler = nullptr;
     Q_INVOKABLE void disableAudio();

diff --git a/handlers/sessionhandler.cpp b/handlers/sessionhandler.cpp
@@ -27,23 +27,23 @@ UserHandler* SessionHandler::getUser()
 
 bool SessionHandler::enableVideo()
 {
-   return mStreamHandler->enableVideo() >= 0;
+    return mOutputStreamHandler->enableVideo() >= 0;
 
 }
 
 void SessionHandler::disableVideo()
 {
-    mStreamHandler->disableVideo();
+    mOutputStreamHandler->disableVideo();
 }
 
 bool SessionHandler::enableAudio()
 {
-    return mStreamHandler->enableAudio() >= 0;
+    return mOutputStreamHandler->enableAudio() >= 0;
 }
 
 void SessionHandler::disableAudio()
 {
-    mStreamHandler->disableAudio();
+    mOutputStreamHandler->disableAudio();
 }
 
 void SessionHandler::initOtherStuff()
@@ -53,37 +53,43 @@ void SessionHandler::initOtherStuff()
     QString displayName = mSettings->getDisplayName();
     mSessionIsActive = true;
     mInputStreamHandler = new InputStreamHandler(mImageHandler, mBufferSize, mAddress);
-    mSocketHandler = new UdpSocketHandler(mBufferSize, mPortNumberUDP, mInputStreamHandler, streamId, roomId, mAddress);
+    mUdpSocketHandler = new UdpSocketHandler(mBufferSize, mPortNumberUDP, mInputStreamHandler, streamId, roomId, mAddress);
     //mTcpServerHandler = new TcpServerHandler(mInputStreamHandler, mPort);
     mTcpSocketHandler = new TcpSocketHandler(mInputStreamHandler, streamId, roomId, displayName, mAddress, mPortNumberTCP);
-    mStreamHandler = new StreamHandler(mImageHandler, mSocketHandler, mBufferSize, mSettings, mTcpSocketHandler);
+    mOutputStreamHandler = new OutputStreamHandler(mImageHandler, mUdpSocketHandler, mBufferSize, mSettings, mTcpSocketHandler);
     //Init tcpServerHandler
     //mTcpServerHandler->init();
     //Init sending of our header, empty or not
     mTcpSocketHandler->init();
-    mStreamHandler->init();
+    mOutputStreamHandler->init();
 }
 
 void SessionHandler::closeOtherStuff()
 {
     mSessionIsActive = false;
     qDebug() << "Before close";
-    mInputStreamHandler->close();
-    mSocketHandler->closeSocket();
+    //Sockets should close first, they use buffers and locks inside inputStreamHandler
+    mUdpSocketHandler->closeSocket();
     mTcpSocketHandler->close();
-    mStreamHandler->close();
+
+    //This will clear all the vectors containing objects connected to each person in the room
+    mInputStreamHandler->close();
+
+    //This will close the output streams
+    mOutputStreamHandler->close();
+
     qDebug() << "After close, about to delete";
     delete mInputStreamHandler;
-    delete mSocketHandler;
+    delete mUdpSocketHandler;
     delete mTcpSocketHandler;
-    delete mStreamHandler;
+    delete mOutputStreamHandler;
     qDebug() << "Deleted everything";
     mImageHandler->removeAllPeers();
 }
 
 QVariantList SessionHandler::getAudioInputDevices()
 {
-    return mStreamHandler->getAudioInputDevices();
+    return mOutputStreamHandler->getAudioInputDevices();
 }
 
 bool SessionHandler::joinSession(QString _roomId, QString _roomPassword)
@@ -110,7 +116,11 @@ bool SessionHandler::joinSession(QString _roomId, QString _roomPassword)
             mSettings->setLastRoomPassword(mRoomPassword);
             mSettings->saveSettings();
             qDebug() << "Adding peer with display name" << mSettings->getDisplayName();
-            mImageHandler->addPeer(0, mSettings->getDisplayName());
+
+            //TODO maybe more intensive to find numeric_limit in map compared to 0?
+            uint_8 userIndex = std::numeric_limits<uint_8>::max();
+
+            mImageHandler->addPeer(userIndex, mSettings->getDisplayName());
 
 
             //Init everything that needs init
@@ -187,8 +197,9 @@ bool SessionHandler::leaveSession()
     //CLose all that is opened;
     closeOtherStuff();
 
+    //Serveren gjør jo dette når TCP blir disconnected? Er dette bare gammel kode?
 
-    if (mUser->isGuest())
+    /*if (mUser->isGuest())
     {
         QSqlQuery q(mDb->mDb);
         q.prepare("DELETE FROM roomSession WHERE roomId = :roomId AND userId = :userId");
@@ -222,7 +233,7 @@ bool SessionHandler::leaveSession()
             qDebug() << "Failed Query" << Q_FUNC_INFO;
         }
     }
-    return false;
+    return false;*/
 }
 
 bool SessionHandler::createSession(QString roomId, QString roomPassword)
@@ -301,10 +312,10 @@ void SessionHandler::updateDisplayName()
 
 bool SessionHandler::checkVideoEnabled()
 {
-    return mStreamHandler->checkVideoEnabled();
+    return mOutputStreamHandler->checkVideoEnabled();
 }
 
 bool SessionHandler::checkAudioEnabled()
 {
-    return mStreamHandler->checkAudioEnabled();
+    return mOutputStreamHandler->checkAudioEnabled();
 }
diff --git a/handlers/sessionhandler.h b/handlers/sessionhandler.h
@@ -12,7 +12,7 @@
 #include "handlers/udpsockethandler.h"
 #include "handlers/tcpserverhandler.h"
 #include "handlers/tcpsockethandler.h"
-#include "handlers/streamhandler.h"
+#include "handlers/outputstreamhandler.h"
 
 class SessionHandler : public QObject
 {
@@ -61,10 +61,10 @@ class SessionHandler : public QObject
     Database* mDb;
     UserHandler* mUser;
     Settings* mSettings;
-    StreamHandler* mStreamHandler;
+    OutputStreamHandler* mOutputStreamHandler;
     ImageHandler* mImageHandler;
     InputStreamHandler* mInputStreamHandler;
-    UdpSocketHandler* mSocketHandler;
+    UdpSocketHandler* mUdpSocketHandler;
     TcpServerHandler* mTcpServerHandler;
     TcpSocketHandler* mTcpSocketHandler;
 

diff --git a/main.cpp b/main.cpp
@@ -10,7 +10,7 @@
 #include <libavformat/avformat.h>
 #include <QAudioInput>
 #include <QTimer>
-#include "handlers/streamhandler.h"
+#include "handlers/outputstreamhandler.h"
 #include "handlers/videoplaybackhandler.h"
 #include "settings.h"
 #include "handlers/imagehandler.h"

diff --git a/qZoom-Client.pro b/qZoom-Client.pro
@@ -21,14 +21,14 @@ SOURCES += \
         config.cpp \
         core/database.cpp \
         handlers/errorhandler.cpp \
+        handlers/outputstreamhandler.cpp \
         handlers/sessionhandler.cpp \
         handlers/userhandler.cpp \
         handlers/imagehandler.cpp \
         handlers/inputstreamhandler.cpp \
         main.cpp \
         settings.cpp \
         handlers/udpsockethandler.cpp \
-        handlers/streamhandler.cpp \
         handlers/tcpserverhandler.cpp \
         handlers/tcpsockethandler.cpp \
         handlers/videohandler.cpp \
@@ -58,13 +58,13 @@ HEADERS += \
     handlers/audioplaybackhandler.h \
     core/database.h \
     handlers/errorhandler.h \
+    handlers/outputstreamhandler.h \
     handlers/sessionhandler.h \
     handlers/userhandler.h \
     handlers/imagehandler.h \
     handlers/inputstreamhandler.h \
     settings.h \
     handlers/udpsockethandler.h \
-    handlers/streamhandler.h \
     handlers/tcpserverhandler.h \
     handlers/tcpsockethandler.h \
     handlers/videohandler.h \