From 0f2fc6abcdfb405dcc4c0ed7ea90df2f082b740c Mon Sep 17 00:00:00 2001 From: deva Date: Mon, 25 Jul 2005 14:27:14 +0000 Subject: *** empty log message *** --- src/mainwindow.cc | 11 ++++++++++- src/mainwindow.h | 4 ++++ src/player.cc | 11 +++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 8eb06f0..c540767 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -31,6 +31,9 @@ /* * $Log$ + * Revision 1.40 2005/07/25 14:27:14 deva + * *** empty log message *** + * * Revision 1.39 2005/07/25 12:42:13 deva * *** empty log message *** * @@ -288,6 +291,7 @@ void MainWindow::createGui() img_live->setFixedSize(output_width - 20, output_height - 20); img_live->move(10,10); g1->addMultiCellWidget ( img_recedge, 0, 0, 0, 2, Qt::AlignHCenter); + QObject::connect( img_live, SIGNAL(clicked()), this, SLOT(live_clicked()) ); // CPR/NAME LABEL + CPR button lbl_cpr = createLabel("", output_width - (int)(BUTTON_WIDTH * unit), BUTTON_HEIGHT); @@ -326,7 +330,7 @@ void MainWindow::createGui() g1->addWidget(btn_freeze, 3, 2); // History widgets - int w = (int)(BUTTON_WIDTH * unit); + int w = (int)((float)BUTTON_WIDTH * unit); int h = (int)(576.0f / (720.0f / ((float)BUTTON_WIDTH * unit))); QImage dummy_resized = img_dummy->smoothScale(w, h); @@ -455,6 +459,11 @@ void MainWindow::clear() lbl_cpr->setText(""); } +void MainWindow::live_clicked() +{ + info->info("live_clicked"); +} + void MainWindow::clear_clicked() { if(MessageBox(this, diff --git a/src/mainwindow.h b/src/mainwindow.h index 7f85af2..9c7ba39 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -31,6 +31,9 @@ /* * $Log$ + * Revision 1.20 2005/07/25 14:27:14 deva + * *** empty log message *** + * * Revision 1.19 2005/07/23 10:11:45 deva * *** empty log message *** * @@ -155,6 +158,7 @@ public slots: void freeze_clicked(); void redraw_edge(); void taskbar_update(); + void live_clicked(); private: void clear(); diff --git a/src/player.cc b/src/player.cc index 0fee7b1..567ac2f 100644 --- a/src/player.cc +++ b/src/player.cc @@ -39,6 +39,9 @@ /* * $Log$ + * Revision 1.27 2005/07/25 14:27:14 deva + * *** empty log message *** + * * Revision 1.26 2005/07/25 12:42:13 deva * *** empty log message *** * @@ -96,8 +99,8 @@ Player::Player(Info *ginfo, return; } - screen = SDL_SetVideoMode(width, - height, + screen = SDL_SetVideoMode(720,//width, + 576,//height, 0, // 0 bpp means 'use current display depth' SDL_HWSURFACE | SDL_ANYFORMAT | SDL_HWACCEL); @@ -108,8 +111,8 @@ Player::Player(Info *ginfo, return; } - overlay = SDL_CreateYUVOverlay(width, - height, + overlay = SDL_CreateYUVOverlay(720,//width, + 576,//height, SDL_YUY2_OVERLAY, // Match for the libdv decoder output screen); if(!overlay) { -- cgit v1.2.3