summaryrefslogtreecommitdiff
path: root/src/mainwindow.cc
diff options
context:
space:
mode:
authordeva <deva>2005-07-25 15:56:27 +0000
committerdeva <deva>2005-07-25 15:56:27 +0000
commitca7341269959f106656efa78f17628560105bd3d (patch)
tree662a9ff242eebdbc7a393c5baaa356adf57a05a1 /src/mainwindow.cc
parent8c381fe44a179b4b84ecc50e810980f7af9a0f58 (diff)
*** empty log message ***
Diffstat (limited to 'src/mainwindow.cc')
-rw-r--r--src/mainwindow.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index b73e133..548f323 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -31,6 +31,9 @@
/*
* $Log$
+ * Revision 1.42 2005/07/25 15:56:27 deva
+ * *** empty log message ***
+ *
* Revision 1.41 2005/07/25 15:35:41 deva
* *** empty log message ***
*
@@ -174,10 +177,12 @@ MainWindow::MainWindow(QApplication *qApp, QWidget* parent, const char* name )
connect(timer, SIGNAL(timeout()), SLOT(redraw_edge()));
rec_edge_counter = 0.0f;
+ // This must be defined before the gui i created (img_live uses it as parameter)
+ camera = new Camera(info);
+
createGui();
show();
- camera = new Camera(info);
camera->connect(config->readString("server_addr")->c_str(),
config->readInt("server_port"),
img_live->width(), img_live->height());
@@ -291,7 +296,7 @@ void MainWindow::createGui()
img_recedge->setBackgroundColor(QColor(160,160,160));
img_recedge->setFixedSize(output_width, output_height);
- img_live = new VideoWidget(img_recedge);
+ img_live = new VideoWidget(img_recedge, camera);
img_live->setFixedSize(output_width - 20, output_height - 20);
img_live->move(10,10);
g1->addMultiCellWidget ( img_recedge, 0, 0, 0, 2, Qt::AlignHCenter);