summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authordeva <deva>2006-04-18 13:06:24 +0000
committerdeva <deva>2006-04-18 13:06:24 +0000
commit108e71a9fb9b69fb58a1a4d72104527ef0165508 (patch)
tree1de2b5355eb9ea4400c68fbb6f4c6a15196e828f /client
parent25a827c0a9aa0f14cd09a5b45d43a39e4f62ef8d (diff)
*** empty log message ***
Diffstat (limited to 'client')
-rw-r--r--client/decoder.cc3
-rw-r--r--client/player.cc11
2 files changed, 10 insertions, 4 deletions
diff --git a/client/decoder.cc b/client/decoder.cc
index 48dc67d..ef2185c 100644
--- a/client/decoder.cc
+++ b/client/decoder.cc
@@ -108,7 +108,8 @@ bool Decoder::eventFilter(QObject *o, QEvent *e)
// printf("QUIT from: %p, this: %p, testing: %p\n", o, this, qApp->activeWindow());
if(qApp->activeWindow() == (QWidget*)o) { // Ignore close events from non top level widgets
running = false; // Tell the thread to stop.
- closesem.acquire(); // Wait for the thread to stop.
+ sleep(1);// Wait for the thread to stop. (The ugly way!)
+ // closesem.acquire(); // Wait for the thread to stop.
}
}
diff --git a/client/player.cc b/client/player.cc
index 608d53d..cb62de8 100644
--- a/client/player.cc
+++ b/client/player.cc
@@ -55,7 +55,12 @@ void Player::show_frame()
dvdecoder.decode(frame);
decoder->pframeRelease(); // Release frame data
- render.width = widget->width();
- render.height = widget->height();
- render.display(WIDTH, HEIGHT);
+ if(widget->width() / 4 < widget->height() / 3) {
+ render.width = widget->width();
+ render.height = render.width / 4 * 3;
+ } else {
+ render.height = widget->height();
+ render.width = render.height / 3 * 4;
+ }
+ render.display(WIDTH / 2, HEIGHT / 2);
}