experimental chat stuff

Author: aliakseis

CMakeLists.txt

@@ -84,6 +84,7 @@ if(ANDROID)
     cameraman.h
     http.cpp
     http.h
+    isendrecv.h
     sendrecv.cpp
     sendrecv.h
     signaling_connection.cpp

isendrecv.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <functional>
+
+#include <QString>
+
+struct ISendRecv
+{
+    virtual void handleRecv(const char* data) = 0;
+    virtual void setSendLambda(std::function<void(const QString&)> lambda) = 0;
+};

mainwindow.cpp

@@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(ui->chatInput, &QLineEdit::returnPressed, this, &MainWindow::onChatInputReturnPressed);
     connect(ui->sendButton, &QPushButton::clicked, this, &MainWindow::onSendButtonClicked);
 
-    connect(this, &MainWindow::messageSent, this, &MainWindow::onMessageReceived, Qt::QueuedConnection);
+    connect(this, &MainWindow::messageReceived, this, &MainWindow::onMessageReceived);
 }
 
 MainWindow::~MainWindow()
@@ -59,7 +59,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::onRingingCall()
 {
-    start_sendrecv(ui->videoArea->winId(), m_volume);
+    start_sendrecv(ui->videoArea->winId(), m_volume, this);
 }
 
 void MainWindow::onHangUp()
@@ -127,3 +127,14 @@ void MainWindow::sendMessage(const QString& message)
     // Clear the chat input
     ui->chatInput->clear();
 }
+
+void MainWindow::handleRecv(const char* data)
+{
+    if (data && *data)
+        emit messageReceived(data);
+}
+
+void MainWindow::setSendLambda(std::function<void(const QString&)> lambda)
+{
+    connect(this, &MainWindow::messageSent, lambda);
+}

mainwindow.h

@@ -1,6 +1,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include "isendrecv.h"
+
 #include <QMainWindow>
 
 QT_BEGIN_NAMESPACE
@@ -11,7 +13,7 @@ class QSlider;
 
 class MainToolBar;
 
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public ISendRecv
 {
     Q_OBJECT
 
@@ -22,7 +24,7 @@ class MainWindow : public QMainWindow
 signals:
     // A signal that is emitted when a message is sent to another user
     void messageSent(const QString& message);
-
+    void messageReceived(const QString& message);
 
 private slots:
     void onRingingCall();
@@ -51,5 +53,9 @@ private slots:
 
     MainToolBar* m_mainToolbar;
     QSlider* m_volume;
+
+    // Inherited via ISendRecv
+    void handleRecv(const char* data) override;
+    void setSendLambda(std::function<void(const QString&)> lambda) override;
 };
 #endif // MAINWINDOW_H

preferences.cpp

@@ -45,8 +45,8 @@ int getSliceDurationSecs() // zero if no slices
     if (index < 0)
         return 0;
 
-    const int minutes = index / std::size(sliceIntervalValues);
-    const int valueIdx = index % std::size(sliceIntervalValues);
+    const auto minutes = index / std::size(sliceIntervalValues);
+    const auto valueIdx = index % std::size(sliceIntervalValues);
 
     return (minutes ? 60 : 1) * sliceIntervalValues[valueIdx];
 }

sendrecv.cpp

@@ -1,4 +1,7 @@
 #include "sendrecv.h"
+
+#include "isendrecv.h"
+
 /*
  * Demo gstreamer app for negotiating and streaming a sendrecv webrtc stream
  * with a browser JS app.
@@ -59,6 +62,8 @@ static guintptr xwinid;
 
 static QSlider* g_volume_notifier;
 
+static ISendRecv* p_sendrecv = nullptr;
+
 ////////////////////////////////////////////////////////////////////
 
 
@@ -780,6 +785,7 @@ data_channel_on_error (GObject * dc, gpointer user_data)
   cleanup_and_quit_loop ("Data channel error", APP_STATE_UNKNOWN);
 }
 
+/*
 static void
 data_channel_on_open (GObject * dc, gpointer user_data)
 {
@@ -789,6 +795,7 @@ data_channel_on_open (GObject * dc, gpointer user_data)
   g_signal_emit_by_name (dc, "send-data", bytes);
   g_bytes_unref (bytes);
 }
+*/
 
 static void
 data_channel_on_close (GObject * dc, gpointer user_data)
@@ -799,16 +806,17 @@ data_channel_on_close (GObject * dc, gpointer user_data)
 static void
 data_channel_on_message_string (GObject * dc, gchar * str, gpointer user_data)
 {
-  gst_print ("Received data channel message: %s\n", str);
+  //gst_print ("Received data channel message: %s\n", str);
+    if (p_sendrecv)
+        p_sendrecv->handleRecv(str);
 }
 
 static void
 connect_data_channel_signals (GObject * data_channel)
 {
   g_signal_connect (data_channel, "on-error",
       G_CALLBACK (data_channel_on_error), NULL);
-  g_signal_connect (data_channel, "on-open", G_CALLBACK (data_channel_on_open),
-      NULL);
+  //g_signal_connect (data_channel, "on-open", G_CALLBACK (data_channel_on_open), NULL);
   g_signal_connect (data_channel, "on-close",
       G_CALLBACK (data_channel_on_close), NULL);
   g_signal_connect (data_channel, "on-message-string",
@@ -821,6 +829,17 @@ on_data_channel (GstElement * webrtc, GObject * data_channel,
 {
   connect_data_channel_signals (data_channel);
   receive_channel = data_channel;
+  if (p_sendrecv)
+  {
+      auto lam = [](const QString& s) {
+          auto line = s.toStdString();
+          if (!line.empty() && receive_channel)
+              g_signal_emit_by_name(receive_channel, "send-string", line.c_str());
+          };
+
+      p_sendrecv->setSendLambda(lam);
+  }
+
 }
 
 static void
@@ -1082,6 +1101,18 @@ start_pipeline (gboolean create_offer)
   if (send_channel) {
     gst_print ("Created data channel\n");
     connect_data_channel_signals (send_channel);
+
+    if (p_sendrecv)
+    {
+        auto lam = [](const QString& s) {
+            auto line = s.toStdString();
+            if (!line.empty() && send_channel)
+                g_signal_emit_by_name(send_channel, "send-string", line.c_str());
+        };
+
+        p_sendrecv->setSendLambda(lam);
+    }
+
   } else {
     gst_print ("Could not create data channel, is usrsctp available?\n");
   }
@@ -1351,14 +1382,16 @@ static gpointer glibMainLoopThreadFunc(gpointer /*unused*/)
 }
 
 
-bool start_sendrecv(unsigned long long winid, QSlider* volume_notifier)
+bool start_sendrecv(unsigned long long winid, QSlider* volume_notifier, ISendRecv* sendrecv)
 {
     if (loop == nullptr) {
         if (!check_plugins ())
             return false;
 
         xwinid = winid;
 
+        p_sendrecv = sendrecv;
+
         g_volume_notifier = volume_notifier;
 
         app_state = APP_STATE_UNKNOWN;

sendrecv.h

@@ -2,6 +2,7 @@
 
 #include <glib.h>
 
+
 enum AppState
 {
   APP_STATE_UNKNOWN = 0,
@@ -36,5 +37,7 @@ void on_server_message(const gchar *text);
 gboolean
 start_pipeline(gboolean create_offer);
 
-bool start_sendrecv(unsigned long long winid, QSlider* volume_notifier);
+struct ISendRecv;
+
+bool start_sendrecv(unsigned long long winid, QSlider* volume_notifier, ISendRecv* sendrecv);