First (crashing) prototype.

1 files changed, 57 insertions, 10 deletions

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 4dcac58..3e31136 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -27,38 +27,85 @@
 #include "mainwindow.h"
 
 #include <QLabel>
+#include <QStatusBar>
+
 #include <stdio.h>
 
-MainWindow::MainWindow(QString v4ldev, QString adev)
-  : v4l(v4ldev), ah(adev)
+MainWindow::MainWindow(QString v4ldev, QString adev,
+                       QHostAddress addr, quint16 port)
+  : v4l(v4ldev), aih(adev), ostreamer(addr, port), istreamer(addr, port)
 {
-  connect(&v4l, SIGNAL(newImage(QImage)),
-          this, SLOT(newImage(QImage)));
+  /* // Self view:
+  connect(&v4l, SIGNAL(newImage(Frame)),
+          this, SLOT(newImage(Frame)));
+  */
+  connect(&istreamer, SIGNAL(newImage(Frame)),
+          this, SLOT(newImage(Frame)));
+
+  connect(&istreamer, SIGNAL(newAudio(Frame)),
+          &aoh, SLOT(newAudio(Frame)));
 
-  connect(&ah, SIGNAL(newAudio(framelist_t)),
+  /*
+  connect(&aih, SIGNAL(newAudio(framelist_t)),
           this, SLOT(newAudio(framelist_t)));
+  */
+  connect(&v4l, SIGNAL(newImage(Frame)),
+          &ostreamer, SLOT(newImage(Frame)));
+
+  connect(&aih, SIGNAL(newAudio(framelist_t)),
+          &ostreamer, SLOT(newAudio(framelist_t)));
+
+  connect(&status_timer, SIGNAL(timeout()),
+          this, SLOT(updateStatus()));
+
+  status_timer.start(1000);
 
   setCentralWidget(new QLabel());
+
+  statusBar()->showMessage("Starting...");
 }
 
-void MainWindow::newImage(QImage img)
+void MainWindow::updateStatus()
 {
+  size_t ob = ostreamer.getTotal() / 60 / 1024; 
+  size_t ib = istreamer.getTotal() / 60 / 1024; 
+  QString status = 
+    "In: " + QString::number(ib) + "kb/s"
+    + " - " +
+    "Out: " + QString::number(ob) + "kb/s"
+    ;
+  statusBar()->showMessage(status);
+}
+
+void MainWindow::newImage(Frame frame)
+{
+  QImage img;
+  bool res = img.loadFromData((const uchar*)frame.data, frame.size, "JPG");
+  //  printf("processImage() => %s\n", res?"true":"false");
   if(img.isNull()) {
     printf("Invalid image\n");
     return;
   }
 
-  printf("img->w: %d\n", img.width());
-  printf("img->h: %d\n", img.height());
+  //  printf("img->w: %d\n", img.width());
+  //  printf("img->h: %d\n", img.height())
 
   QLabel *l = (QLabel*)centralWidget();
   QPixmap p;
   p.convertFromImage(img);
   l->setPixmap(p);
-  printf("Got one\n");
+
+  //  printf("v"); fflush(stdout);
 }
 
 void MainWindow::newAudio(framelist_t list)
 {
-  printf("audio: %d frames\n", list.size());
+  /*
+  framelist_t::iterator i = list.begin();
+  while(i != list.end()) {
+    sp.playSamples(*i);
+  }
+  //  printf("audio: %d frames\n", list.size());
+  */
+  //  printf("a"); fflush(stdout);
 }