diff options
Diffstat (limited to 'src/mainwindow.cc')
| -rw-r--r-- | src/mainwindow.cc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 5e7a041..8a7c44a 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -32,18 +32,22 @@ #include <stdio.h> MainWindow::MainWindow(QString v4ldev, QString adev, - QHostAddress addr, quint16 port) - : v4l(v4ldev), aih(adev), ostreamer(addr, port), istreamer(addr, port) + OutputStreamer &os, + QList<InputStreamer*> &isl) + : v4l(v4ldev), aih(adev), ostreamer(os), islist(isl) { /* // 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))); + QList<InputStreamer*>::iterator i = islist.begin(); + while(i != islist.end()) { + connect(*i, SIGNAL(newImage(Frame)), + this, SLOT(newImage(Frame))); + connect(*i, SIGNAL(newAudio(Frame)), + &aoh, SLOT(newAudio(Frame))); + i++; + } /* connect(&aih, SIGNAL(newAudio(framelist_t)), @@ -68,7 +72,12 @@ MainWindow::MainWindow(QString v4ldev, QString adev, void MainWindow::updateStatus() { size_t ob = ostreamer.getTotal() / 60; - size_t ib = istreamer.getTotal() / 60; + size_t ib = 0; + QList<InputStreamer*>::iterator i = islist.begin(); + while(i != islist.end()) { + ib += (*i)->getTotal() / 60; + i++; + } QString iunit = "b/s"; if(ib > 1024) { |