[haiku-commits] r33811 - haiku/trunk/src/apps/mediaplayer
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 28 Oct 2009 15:35:33 +0100 (CET)
Author: axeld
Date: 2009-10-28 15:35:33 +0100 (Wed, 28 Oct 2009)
New Revision: 33811
Changeset: http://dev.haiku-os.org/changeset/33811/haiku
Modified:
haiku/trunk/src/apps/mediaplayer/Controller.cpp
haiku/trunk/src/apps/mediaplayer/Controller.h
haiku/trunk/src/apps/mediaplayer/ControllerObserver.cpp
haiku/trunk/src/apps/mediaplayer/ControllerObserver.h
haiku/trunk/src/apps/mediaplayer/ControllerView.cpp
haiku/trunk/src/apps/mediaplayer/ControllerView.h
haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
haiku/trunk/src/apps/mediaplayer/InfoWin.h
haiku/trunk/src/apps/mediaplayer/MainApp.cpp
haiku/trunk/src/apps/mediaplayer/MainApp.h
haiku/trunk/src/apps/mediaplayer/PlaybackState.h
haiku/trunk/src/apps/mediaplayer/TransportControlGroup.cpp
haiku/trunk/src/apps/mediaplayer/TransportControlGroup.h
haiku/trunk/src/apps/mediaplayer/VideoNode.cpp
haiku/trunk/src/apps/mediaplayer/VideoNode.h
haiku/trunk/src/apps/mediaplayer/VideoView.cpp
haiku/trunk/src/apps/mediaplayer/VideoView.h
Log:
* Coding style cleanups, no functional change.
Modified: haiku/trunk/src/apps/mediaplayer/Controller.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/Controller.cpp 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/Controller.cpp 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
*
*/
+
+
#include "Controller.h"
#include <new>
Modified: haiku/trunk/src/apps/mediaplayer/Controller.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/Controller.h 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/Controller.h 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -21,6 +21,7 @@
#ifndef __CONTROLLER_H
#define __CONTROLLER_H
+
#include <Entry.h>
#include <MediaDefs.h>
#include <MediaFormats.h>
@@ -33,6 +34,7 @@
#include "NodeManager.h"
#include "PlaylistItem.h"
+
class AudioTrackSupplier;
class BBitmap;
class BMediaFile;
@@ -44,9 +46,9 @@
class VideoTrackSupplier;
class VideoView;
+
class Controller : public NodeManager {
public:
-
class Listener {
public:
Listener();
@@ -203,5 +205,4 @@
};
-#endif
-
+#endif // __CONTROLLER_H
Modified: haiku/trunk/src/apps/mediaplayer/ControllerObserver.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerObserver.cpp 2009-10-28
14:07:36 UTC (rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/ControllerObserver.cpp 2009-10-28
14:35:33 UTC (rev 33811)
@@ -1,20 +1,21 @@
/*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stephan Aßmus <superstippi@xxxxxx>
*/
+
#include "ControllerObserver.h"
#include <Message.h>
ControllerObserver::ControllerObserver(BHandler* target, uint32 observeFlags)
- : Controller::Listener()
- , AbstractLOAdapter(target)
- , fObserveFlags(observeFlags)
+ :
+ AbstractLOAdapter(target),
+ fObserveFlags(observeFlags)
{
}
@@ -148,5 +149,3 @@
DeliverMessage(message);
}
-
-
Modified: haiku/trunk/src/apps/mediaplayer/ControllerObserver.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerObserver.h 2009-10-28
14:07:36 UTC (rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/ControllerObserver.h 2009-10-28
14:35:33 UTC (rev 33811)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -8,9 +8,11 @@
#ifndef CONTROLLER_OBSERVER_H
#define CONTROLLER_OBSERVER_H
+
#include "AbstractLOAdapter.h"
#include "Controller.h"
+
enum {
MSG_CONTROLLER_FILE_FINISHED = 'cnff',
MSG_CONTROLLER_FILE_CHANGED = 'cnfc',
@@ -38,9 +40,10 @@
OBSERVE_ALL_CHANGES = 0xffff
};
-class ControllerObserver : public Controller::Listener,
- public AbstractLOAdapter {
- public:
+
+class ControllerObserver
+ : public Controller::Listener, public AbstractLOAdapter {
+public:
ControllerObserver(BHandler*
target,
uint32 observeFlags =
OBSERVE_ALL_CHANGES);
virtual ~ControllerObserver();
@@ -60,7 +63,7 @@
virtual void VolumeChanged(float volume);
virtual void MutedChanged(bool muted);
- private:
+private:
uint32 fObserveFlags;
};
Modified: haiku/trunk/src/apps/mediaplayer/ControllerView.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerView.cpp 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/ControllerView.cpp 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
*
*/
+
+
#include "ControllerView.h"
#include <Autolock.h>
@@ -30,12 +32,14 @@
#include "Playlist.h"
#include "PlaylistObserver.h"
+
ControllerView::ControllerView(BRect frame, Controller* controller,
Playlist* playlist)
- : TransportControlGroup(frame, true, true, false)
- , fController(controller)
- , fPlaylist(playlist)
- , fPlaylistObserver(new PlaylistObserver(this))
+ :
+ TransportControlGroup(frame, true, true, false),
+ fController(controller),
+ fPlaylist(playlist),
+ fPlaylistObserver(new PlaylistObserver(this))
{
fPlaylist->AddListener(fPlaylistObserver);
}
@@ -78,6 +82,7 @@
}
}
+
// #pragma mark -
Modified: haiku/trunk/src/apps/mediaplayer/ControllerView.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerView.h 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/ControllerView.h 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
*
*/
-
#ifndef __CONTROLLER_VIEW_H
#define __CONTROLLER_VIEW_H
+
#include "TransportControlGroup.h"
@@ -30,8 +30,8 @@
class Playlist;
class PlaylistObserver;
-class ControllerView : public TransportControlGroup
-{
+
+class ControllerView : public TransportControlGroup {
public:
ControllerView(BRect frame,
Controller* controller,
Playlist* playlist);
@@ -63,4 +63,4 @@
PlaylistObserver* fPlaylistObserver;
};
-#endif
+#endif // __CONTROLLER_VIEW_H
Modified: haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/InfoWin.cpp 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/InfoWin.cpp 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
*
*/
+
+
#include "InfoWin.h"
#include <math.h>
@@ -155,11 +157,12 @@
InfoWin::InfoWin(BPoint leftTop, Controller* controller)
- : BWindow(BRect(leftTop.x, leftTop.y, leftTop.x + MIN_WIDTH - 1,
+ :
+ BWindow(BRect(leftTop.x, leftTop.y, leftTop.x + MIN_WIDTH - 1,
leftTop.y + 300), NAME, B_TITLED_WINDOW,
- B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
- , fController(controller)
- , fControllerObserver(new ControllerObserver(this,
+ B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
+ fController(controller),
+ fControllerObserver(new ControllerObserver(this,
OBSERVE_FILE_CHANGES | OBSERVE_TRACK_CHANGES |
OBSERVE_STAT_CHANGES))
{
BRect rect = Bounds();
@@ -175,10 +178,9 @@
bigFont.SetSize(bigFont.Size() + 6);
font_height fh;
bigFont.GetHeight(&fh);
- fFilenameView = new BStringView(BRect(div + 10, 20,
-
rect.right - 10,
-
20 + fh.ascent + 5),
-
"filename", "");
+ fFilenameView = new BStringView(
+ BRect(div + 10, 20, rect.right - 10, 20 + fh.ascent + 5),
+ "filename", "");
AddChild(fFilenameView);
fFilenameView->SetFont(&bigFont);
fFilenameView->SetViewColor(fInfoView->ViewColor());
@@ -219,9 +221,6 @@
{
fController->RemoveListener(fControllerObserver);
delete fControllerObserver;
-
- //fInfoListView->MakeEmpty();
- //delete [] fInfoItems;
}
@@ -229,13 +228,13 @@
void
-InfoWin::FrameResized(float new_width, float new_height)
+InfoWin::FrameResized(float newWidth, float newHeight)
{
}
void
-InfoWin::MessageReceived(BMessage *msg)
+InfoWin::MessageReceived(BMessage* msg)
{
switch (msg->what) {
case MSG_CONTROLLER_FILE_FINISHED:
@@ -283,13 +282,6 @@
void
InfoWin::ResizeToPreferred()
{
-#if 0
- float height = BASE_HEIGHT;
- for (int i = 0; BListItem *li = fInfoListView->ItemAt(i); i++) {
- height += li->Height();
- }
- ResizeTo(Bounds().Width(), height);
-#endif
}
@@ -469,7 +461,6 @@
}
if ((which & INFO_COPYRIGHT) && fController->HasFile()) {
-
BString s;
if (fController->GetCopyright(&s) == B_OK && s.Length() > 0) {
fLabelsView->Insert("Copyright\n\n");
Modified: haiku/trunk/src/apps/mediaplayer/InfoWin.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/InfoWin.h 2009-10-28 14:07:36 UTC (rev
33810)
+++ haiku/trunk/src/apps/mediaplayer/InfoWin.h 2009-10-28 14:35:33 UTC (rev
33811)
@@ -20,6 +20,7 @@
#ifndef __FILE_INFO_WIN_H
#define __FILE_INFO_WIN_H
+
#include <Window.h>
@@ -28,8 +29,8 @@
class Controller;
class ControllerObserver;
class InfoView;
-
+
#define INFO_STATS 0x00000001
#define INFO_TRANSPORT 0x00000002
#define INFO_FILE 0x00000004
@@ -45,7 +46,7 @@
InfoWin(BPoint
leftTop,
Controller* controller);
virtual ~InfoWin();
-
+
virtual void FrameResized(float newWidth,
float newHeight);
virtual void MessageReceived(BMessage*
message);
virtual bool QuitRequested();
@@ -54,10 +55,10 @@
void ResizeToPreferred();
void Update(uint32 which =
INFO_ALL);
-private:
+private:
Controller* fController;
ControllerObserver* fControllerObserver;
-
+
InfoView* fInfoView;
BStringView* fFilenameView;
BTextView* fLabelsView;
Modified: haiku/trunk/src/apps/mediaplayer/MainApp.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainApp.cpp 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/MainApp.cpp 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
*
*/
+
+
#include "MainApp.h"
#include <Alert.h>
@@ -46,17 +48,18 @@
MainApp::MainApp()
- : BApplication(kAppSig),
- fPlayerCount(0),
- fFirstWindow(NULL),
- fSettingsWindow(NULL),
+ :
+ BApplication(kAppSig),
+ fPlayerCount(0),
+ fFirstWindow(NULL),
+ fSettingsWindow(NULL),
- fOpenFilePanel(NULL),
- fSaveFilePanel(NULL),
- fLastFilePanelFolder(),
+ fOpenFilePanel(NULL),
+ fSaveFilePanel(NULL),
+ fLastFilePanelFolder(),
- fMediaServerRunning(false),
- fMediaAddOnServerRunning(false)
+ fMediaServerRunning(false),
+ fMediaAddOnServerRunning(false)
{
mpSettings settings = Settings::CurrentSettings();
fLastFilePanelFolder = settings.filePanelFolder;
@@ -136,7 +139,7 @@
fMediaAddOnServerRunning = be_roster->IsRunning(kMediaServerAddOnSig);
if (!fMediaServerRunning || !fMediaAddOnServerRunning) {
- BAlert* alert = new BAlert("start_media_server",
+ BAlert* alert = new BAlert("start_media_server",
"It appears the Media Server is not running.\n"
"Would you like to start it ?", "Quit", "Start Media
Server", NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
@@ -181,12 +184,12 @@
void
-MainApp::ArgvReceived(int32 argc, char **argv)
+MainApp::ArgvReceived(int32 argc, char** argv)
{
char cwd[B_PATH_NAME_LENGTH];
getcwd(cwd, sizeof(cwd));
- BMessage m(B_REFS_RECEIVED);
+ BMessage message(B_REFS_RECEIVED);
for (int i = 1; i < argc; i++) {
printf("MainApp::ArgvReceived %s\n", argv[i]);
@@ -200,13 +203,13 @@
continue;
entry_ref ref;
- if (B_OK == entry.GetRef(&ref))
- m.AddRef("refs", &ref);
+ if (entry.GetRef(&ref) == B_OK)
+ message.AddRef("refs", &ref);
}
- if (m.HasRef("refs")) {
+ if (message.HasRef("refs")) {
printf("MainApp::ArgvReceived calling RefsReceived\n");
- RefsReceived(&m);
+ RefsReceived(&message);
}
}
@@ -391,7 +394,7 @@
BMessage targetMessage;
if (message->FindMessage("message", &targetMessage) == B_OK)
panelMessage.AddMessage("message", &targetMessage);
-
+
BMessenger target;
if (message->FindMessenger("target", &target) == B_OK)
panelMessage.AddMessenger("target", target);
Modified: haiku/trunk/src/apps/mediaplayer/MainApp.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainApp.h 2009-10-28 14:07:36 UTC (rev
33810)
+++ haiku/trunk/src/apps/mediaplayer/MainApp.h 2009-10-28 14:35:33 UTC (rev
33811)
@@ -21,6 +21,7 @@
#ifndef __MAIN_APP_H
#define __MAIN_APP_H
+
#include <Application.h>
#include <Entry.h>
@@ -100,4 +101,4 @@
extern MainApp* gMainApp;
extern const char* kAppSig;
-#endif
+#endif // __MAIN_APP_H
Modified: haiku/trunk/src/apps/mediaplayer/PlaybackState.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/PlaybackState.h 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/PlaybackState.h 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -8,10 +8,12 @@
#ifndef PLAYBACK_STATE_H
#define PLAYBACK_STATE_H
+
enum {
PLAYBACK_STATE_STOPPED = 0,
PLAYBACK_STATE_PLAYING = 1,
PLAYBACK_STATE_PAUSED = 2,
};
+
#endif // PLAYBACK_STATE_H
Modified: haiku/trunk/src/apps/mediaplayer/TransportControlGroup.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/TransportControlGroup.cpp 2009-10-28
14:07:36 UTC (rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/TransportControlGroup.cpp 2009-10-28
14:35:33 UTC (rev 33811)
@@ -49,14 +49,14 @@
#define kVolumeFactor 1000
#define kPositionFactor 3000
-// constructor
+
TransportControlGroup::TransportControlGroup(BRect frame, bool useSkipButtons,
bool usePeakView, bool useWindButtons)
- : BView(frame, "transport control group",
- B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
- B_WILL_DRAW | B_FRAME_EVENTS)
- , fBottomControlHeight(0.0)
- , fPeakViewMinWidth(0.0)
+ :
+ BView(frame, "transport control group", B_FOLLOW_LEFT_RIGHT |
B_FOLLOW_TOP,
+ B_WILL_DRAW | B_FRAME_EVENTS),
+ fBottomControlHeight(0.0),
+ fPeakViewMinWidth(0.0)
{
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -141,7 +141,7 @@
// Volume Slider
fVolumeSlider = new VolumeSlider(BRect(0.0, 0.0, VOLUME_MIN_WIDTH,
- kVolumeSliderBitmapHeight - 1.0), "volume slider",
+ kVolumeSliderBitmapHeight - 1.0), "volume slider",
_DbToGain(_ExponentialToLinear(kVolumeDbMin)) * kVolumeFactor,
_DbToGain(_ExponentialToLinear(kVolumeDbMax)) * kVolumeFactor,
new BMessage(MSG_SET_VOLUME));
@@ -159,12 +159,12 @@
}
}
-// destructor
+
TransportControlGroup::~TransportControlGroup()
{
}
-// AttachedToWindow
+
void
TransportControlGroup::AttachedToWindow()
{
@@ -188,7 +188,7 @@
FrameResized(Bounds().Width(), Bounds().Height());
}
-// FrameResized
+
void
TransportControlGroup::FrameResized(float width, float height)
{
@@ -198,7 +198,7 @@
_LayoutControls(r);
}
-// GetPreferredSize
+
void
TransportControlGroup::GetPreferredSize(float* width, float* height)
{
@@ -210,7 +210,7 @@
*height = r.Height();
}
-// MessageReceived
+
void
TransportControlGroup::MessageReceived(BMessage* message)
{
@@ -253,55 +253,67 @@
}
}
-// #pragma mark -
-// default implementation for the virtuals
-uint32 TransportControlGroup::EnabledButtons() { return 0; }
-void TransportControlGroup::TogglePlaying() {}
-void TransportControlGroup::Stop()
{}
-void TransportControlGroup::Rewind() {}
-void TransportControlGroup::Forward() {}
-void TransportControlGroup::SkipBackward() {}
-void TransportControlGroup::SkipForward() {}
-void TransportControlGroup::VolumeChanged(float value) {}
-void TransportControlGroup::ToggleMute() {}
-void TransportControlGroup::PositionChanged(float value){}
+// #pragma mark - default implementation for the virtuals
+
+uint32
+TransportControlGroup::EnabledButtons()
+{
+ return 0;
+}
+
+
+void TransportControlGroup::TogglePlaying() {}
+void TransportControlGroup::Stop() {}
+void TransportControlGroup::Rewind() {}
+void TransportControlGroup::Forward() {}
+void TransportControlGroup::SkipBackward() {}
+void TransportControlGroup::SkipForward() {}
+void TransportControlGroup::VolumeChanged(float value) {}
+void TransportControlGroup::ToggleMute() {}
+void TransportControlGroup::PositionChanged(float value) {}
+
+
// #pragma mark -
float
-TransportControlGroup::_LinearToExponential(float db_in)
+TransportControlGroup::_LinearToExponential(float dbIn)
{
- float db = db_in;
+ float db = dbIn;
if (db >= 0) {
- db = db * (pow(fabs(kVolumeDbMax), (1.0 /
kVolumeDbExpPositive)) / fabs(kVolumeDbMax));
+ db = db * (pow(fabs(kVolumeDbMax), (1.0 / kVolumeDbExpPositive))
+ / fabs(kVolumeDbMax));
db = pow(db, kVolumeDbExpPositive);
} else {
db = -db;
- db = db * (pow(fabs(kVolumeDbMin), (1.0 /
kVolumeDbExpNegative)) / fabs(kVolumeDbMin));
+ db = db * (pow(fabs(kVolumeDbMin), (1.0 / kVolumeDbExpNegative))
+ / fabs(kVolumeDbMin));
db = pow(db, kVolumeDbExpNegative);
db = -db;
}
- printf("_LinearToExponential %.4f => %.4f\n", db_in, db);
+ printf("_LinearToExponential %.4f => %.4f\n", dbIn, db);
return db;
}
float
-TransportControlGroup::_ExponentialToLinear(float db_in)
+TransportControlGroup::_ExponentialToLinear(float dbIn)
{
- float db = db_in;
+ float db = dbIn;
if (db >= 0) {
db = pow(db, (1.0 / kVolumeDbExpPositive));
- db = db * (fabs(kVolumeDbMax) / pow(fabs(kVolumeDbMax), (1.0 /
kVolumeDbExpPositive)));
+ db = db * (fabs(kVolumeDbMax) / pow(fabs(kVolumeDbMax),
+ (1.0 / kVolumeDbExpPositive)));
} else {
db = -db;
db = pow(db, (1.0 / kVolumeDbExpNegative));
- db = db * (fabs(kVolumeDbMin) / pow(fabs(kVolumeDbMin), (1.0 /
kVolumeDbExpNegative)));
+ db = db * (fabs(kVolumeDbMin) / pow(fabs(kVolumeDbMin),
+ (1.0 / kVolumeDbExpNegative)));
db = -db;
}
- //printf("_ExponentialToLinear %.4f => %.4f\n", db_in, db);
+ //printf("_ExponentialToLinear %.4f => %.4f\n", dbIn, db);
return db;
}
@@ -322,7 +334,7 @@
// #pragma mark -
-// SetEnabled
+
void
TransportControlGroup::SetEnabled(uint32 buttons)
{
@@ -349,9 +361,10 @@
UnlockLooper();
}
+
// #pragma mark -
-// SetPlaybackState
+
void
TransportControlGroup::SetPlaybackState(uint32 state)
{
@@ -373,7 +386,7 @@
UnlockLooper();
}
-// SetSkippable
+
void
TransportControlGroup::SetSkippable(bool backward, bool forward)
{
@@ -388,9 +401,10 @@
UnlockLooper();
}
+
// #pragma mark -
-// SetAudioEnabled
+
void
TransportControlGroup::SetAudioEnabled(bool enabled)
{
@@ -403,7 +417,7 @@
UnlockLooper();
}
-// SetMuted
+
void
TransportControlGroup::SetMuted(bool mute)
{
@@ -440,7 +454,7 @@
// #pragma mark -
-// _LayoutControls
+
void
TransportControlGroup::_LayoutControls(BRect frame) const
{
@@ -535,8 +549,8 @@
}
}
-// _MinFrame
-BRect
+
+BRect
TransportControlGroup::_MinFrame() const
{
// add up width of controls along bottom (seek slider will likely adopt)
@@ -563,7 +577,7 @@
return BRect(0.0, 0.0, minWidth - 1.0, minHeight - 1.0);
}
-// _LayoutControl
+
void
TransportControlGroup::_LayoutControl(BView* view, BRect frame,
bool resizeWidth, bool resizeHeight) const
@@ -581,14 +595,14 @@
view->ResizeTo(width, height);
}
-// _TogglePlaying
+
void
TransportControlGroup::_TogglePlaying()
{
TogglePlaying();
}
-// _Stop
+
void
TransportControlGroup::_Stop()
{
@@ -596,34 +610,35 @@
Stop();
}
-// _Rewind
+
void
TransportControlGroup::_Rewind()
{
Rewind();
}
-// _Forward
+
void
TransportControlGroup::_Forward()
{
Forward();
}
-// _SkipBackward
+
void
TransportControlGroup::_SkipBackward()
{
SkipBackward();
}
-// _SkipForward
+
void
TransportControlGroup::_SkipForward()
{
SkipForward();
}
+
void
TransportControlGroup::_UpdateVolume()
{
@@ -634,7 +649,7 @@
VolumeChanged(gain);
}
-// _ToggleMute
+
void
TransportControlGroup::_ToggleMute()
{
@@ -648,5 +663,3 @@
{
PositionChanged(fSeekSlider->Value() / (float)kPositionFactor);
}
-
-
Modified: haiku/trunk/src/apps/mediaplayer/TransportControlGroup.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/TransportControlGroup.h 2009-10-28
14:07:36 UTC (rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/TransportControlGroup.h 2009-10-28
14:35:33 UTC (rev 33811)
@@ -1,17 +1,19 @@
/*
- * Copyright © 2006-2008 Stephan Aßmus <superstippi@xxxxxx>
+ * Copyright 2006-2008 Stephan Aßmus <superstippi@xxxxxx>
* All rights reserved. Distributed under the terms of the MIT License.
*/
+#ifndef TRANSPORT_CONTROL_GROUP_H
+#define TRANSPORT_CONTROL_GROUP_H
+
// NOTE: Based on my code in the BeOS interface for the VLC media player
// that I did during the VLC 0.4.3 - 0.4.6 times. Code not written by me
// removed. -Stephan Aßmus
-#ifndef TRANSPORT_CONTROL_GROUP_H
-#define TRANSPORT_CONTROL_GROUP_H
#include <View.h>
+
class PeakView;
class PlayPauseButton;
class TransportButton;
@@ -28,11 +30,11 @@
SEEK_ENABLED = 1 << 6,
};
+
class TransportControlGroup : public BView {
- public:
+public:
TransportControlGroup(BRect frame,
- bool
useSkipButtons,
- bool
usePeakView,
+ bool
useSkipButtons, bool usePeakView,
bool
useWindButtons);
virtual
~TransportControlGroup();
@@ -56,9 +58,8 @@
void SetEnabled(uint32
whichButtons);
- void SetPlaybackState(uint32
state);
- void SetSkippable(bool
backward,
-
bool forward);
+ void SetPlaybackState(uint32
state);
+ void SetSkippable(bool
backward, bool forward);
void SetAudioEnabled(bool
enable);
void SetMuted(bool mute);
@@ -69,13 +70,12 @@
PeakView* GetPeakView() const
{
return fPeakView; }
- private:
+private:
void _LayoutControls(BRect
frame) const;
BRect _MinFrame() const;
- void _LayoutControl(BView*
view,
-
BRect frame,
-
bool resizeWidth = false,
-
bool resizeHeight = false) const;
+ void _LayoutControl(BView*
view, BRect frame,
+ bool
resizeWidth = false,
+ bool
resizeHeight = false) const;
void _TogglePlaying();
void _Stop();
Modified: haiku/trunk/src/apps/mediaplayer/VideoNode.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/VideoNode.cpp 2009-10-28 14:07:36 UTC
(rev 33810)
+++ haiku/trunk/src/apps/mediaplayer/VideoNode.cpp 2009-10-28 14:35:33 UTC
(rev 33811)
@@ -1,34 +1,38 @@
/*
- * Copyright (C) 2006 Marcus Overhagen <marcus@xxxxxxxxxxxx>. All rights
reserved.
- *
+ * Copyright 2006 Marcus Overhagen <marcus@xxxxxxxxxxxx>. All rights reserved.
* Distributed under the terms of the MIT License.
*/
+
+
+#include "VideoNode.h"
+
#include <stdio.h>
#include <string.h>
-#include <Window.h>
-#include <TimeSource.h>
-#include <MediaRoster.h>
+
+#include <Bitmap.h>
+#include <Buffer.h>
#include <BufferGroup.h>
-#include <Buffer.h>
-#include <Bitmap.h>
+#include <Debug.h>
#include <Locker.h>
-#include <Debug.h>
+#include <MediaRoster.h>
+#include <TimeSource.h>
+#include <Window.h>
-#include "VideoNode.h"
#include "VideoView.h"
VideoNode::VideoNode(const char *name, VideoView *view)
- : BMediaNode(name)
- , BMediaEventLooper()
- , BBufferConsumer(B_MEDIA_RAW_VIDEO)
- , fVideoView(view)
- , fInput()
- , fOverlayEnabled(true)
- , fOverlayActive(false)
- , fDirectOverlayBuffer(false)
- , fBitmap(0)
- , fBitmapLocker(new BLocker("Video Node Locker"))
+ :
+ BMediaNode(name),
+ BMediaEventLooper(),
+ BBufferConsumer(B_MEDIA_RAW_VIDEO),
+ fVideoView(view),
+ fInput(),
+ fOverlayEnabled(true),
+ fOverlayActive(false),
+ fDirectOverlayBuffer(false),
+ fBitmap(0),
+ fBitmapLocker(new BLocker("Video Node Locker"))
{
}
@@ -129,7 +133,7 @@
default:
printf("VideoNode::HandleEvent unknown event");
break;
- }
+ }
}
@@ -149,7 +153,7 @@
{
if (dst != fInput.destination)
return B_MEDIA_BAD_DESTINATION;
-
+
*out_latency = 10000;
*out_id = TimeSource()->ID();
return B_OK;
@@ -166,18 +170,18 @@
* BBufferConsumer::Connected
* BBufferProducer::Connect
*/
-
+
if (dst != fInput.destination)
- return B_MEDIA_BAD_DESTINATION;
-
+ return B_MEDIA_BAD_DESTINATION;
+
if (format->type == B_MEDIA_NO_TYPE)
format->type = B_MEDIA_RAW_VIDEO;
-
+
if (format->type != B_MEDIA_RAW_VIDEO)
return B_MEDIA_BAD_FORMAT;
- return B_OK;
+ return B_OK;
}
@@ -213,12 +217,12 @@
if (err) {
printf("VideoNode::Connected failed, fOverlayEnabled = %d\n",
fOverlayEnabled);
return err;
- }
+ }
*out_input = fInput;
return B_OK;
-
+
}
@@ -268,12 +272,12 @@
if (err) {
[... truncated: 235 lines follow ...]
Other related posts:
- » [haiku-commits] r33811 - haiku/trunk/src/apps/mediaplayer - axeld
