Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for R5: 

- add missing controls for R5 version
- hack to work around a race that happens on BeOS at least, someone should fix it better. stippi ?


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2008-09-27 22:32:43 +00:00
parent 80fdf43432
commit ca75aaad96
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/apps/mediaplayer/MainApp.cpp
View File

@ -45,12 +45,18 @@ static const char* kMediaServerAddOnSig = "application/x-vnd.Be.addon-host";
MainApp::MainApp() MainApp::MainApp()
: BApplication(kAppSig), : BApplication(kAppSig),
fPlayerCount(0), fPlayerCount(0),
fFirstWindow(NewWindow()), //fFirstWindow(NewWindow()),
fSettingsWindow(NULL), fSettingsWindow(NULL),
fMediaServerRunning(false), fMediaServerRunning(false),
fMediaAddOnServerRunning(false) fMediaAddOnServerRunning(false)
{ {
// XXX: HACK HACK HACK
// this works around a locking issue where gMainApp isn't set yet,
// while NewWindow() calls Show() which in the window thread calls
// Controller::PlayerActivated() which calls gMainApp->PlayerCount()
gMainApp = this;
fFirstWindow = NewWindow();
} }

16
src/apps/mediaplayer/settings/SettingsWindow.cpp
View File

@ -181,8 +181,14 @@ SettingsWindow::SettingsWindow(BRect frame)
BView* view = new BView(frame,"SettingsView",B_FOLLOW_ALL_SIDES,B_WILL_DRAW); BView* view = new BView(frame,"SettingsView",B_FOLLOW_ALL_SIDES,B_WILL_DRAW);
view->SetViewColor(216, 216, 216); view->SetViewColor(216, 216, 216);
BRect btnRect(140.00, frame.bottom - (SPACE + BUTTONHEIGHT), 205.00, BRect btnRect(80.00, frame.bottom - (SPACE + BUTTONHEIGHT), 145.00,
frame.bottom-SPACE); frame.bottom-SPACE);
fRevertB = new BButton(btnRect, "revert", "Revert",
new BMessage(M_SETTINGS_REVERT));
view->AddChild(fRevertB);
btnRect.OffsetBy(btnRect.Width() + SPACE, 0);
BButton* btn = new BButton(btnRect, "btnCancel", "Cancel", BButton* btn = new BButton(btnRect, "btnCancel", "Cancel",
new BMessage(M_SETTINGS_CANCEL)); new BMessage(M_SETTINGS_CANCEL));
view->AddChild(btn); view->AddChild(btn);
@ -226,6 +232,14 @@ SettingsWindow::SettingsWindow(BRect frame)
bbox->AddChild(fLoopSoundsCB = new BCheckBox(rect, "chkBoxLoopSounds", "Loop sounds by default", bbox->AddChild(fLoopSoundsCB = new BCheckBox(rect, "chkBoxLoopSounds", "Loop sounds by default",
new BMessage(M_LOOP_SOUND))); new BMessage(M_LOOP_SOUND)));
rect.OffsetBy(0, rect.Height() + SPACEING);
bbox->AddChild(fUseOverlaysCB = new BCheckBox(rect, "chkBoxUseOverlays", "Use hardware video overlays if available",
new BMessage(M_USE_OVERLAYS)));
rect.OffsetBy(0, rect.Height() + SPACEING);
bbox->AddChild(fScaleBilinearCB = new BCheckBox(rect, "chkBoxScaleBilinear", "Scale movies smoothly (non-overlay mode)",
new BMessage(M_SCALE_BILINEAR)));
rect.OffsetBy(0, rect.Height() + SPACE + SPACEING); rect.OffsetBy(0, rect.Height() + SPACE + SPACEING);
bbox->AddChild(new BStringView(rect, "stringViewPlayBackg", bbox->AddChild(new BStringView(rect, "stringViewPlayBackg",
"Play backgrounds clips at:")); "Play backgrounds clips at:"));