From e0c1abb912bbee8640faf970176cfdbe17cf4135 Mon Sep 17 00:00:00 2001 From: Phil Greenway Date: Sat, 22 Feb 2003 05:04:59 +0000 Subject: [PATCH] Old Media Stuff - will still be used - the slider looks nice ;) Just putting this code aside for the meantime. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2789 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/prefs/media/old/MediaPrefsApp.cpp | 22 ++++++++ src/prefs/media/old/MediaPrefsApp.h | 12 +++++ src/prefs/media/old/MediaPrefsSlider.cpp | 9 ++++ src/prefs/media/old/MediaPrefsSlider.h | 10 ++++ src/prefs/media/old/MediaPrefsView.cpp | 7 +++ src/prefs/media/old/MediaPrefsView.h | 8 +++ src/prefs/media/old/MediaPrefsWindow.cpp | 65 ++++++++++++++++++++++++ src/prefs/media/old/MediaPrefsWindow.h | 17 +++++++ 8 files changed, 150 insertions(+) create mode 100644 src/prefs/media/old/MediaPrefsApp.cpp create mode 100644 src/prefs/media/old/MediaPrefsApp.h create mode 100644 src/prefs/media/old/MediaPrefsSlider.cpp create mode 100644 src/prefs/media/old/MediaPrefsSlider.h create mode 100644 src/prefs/media/old/MediaPrefsView.cpp create mode 100644 src/prefs/media/old/MediaPrefsView.h create mode 100644 src/prefs/media/old/MediaPrefsWindow.cpp create mode 100644 src/prefs/media/old/MediaPrefsWindow.h diff --git a/src/prefs/media/old/MediaPrefsApp.cpp b/src/prefs/media/old/MediaPrefsApp.cpp new file mode 100644 index 0000000000..7b65fd2887 --- /dev/null +++ b/src/prefs/media/old/MediaPrefsApp.cpp @@ -0,0 +1,22 @@ +#include "MediaPrefsApp.h" + + +MediaPrefsApp::MediaPrefsApp() + : BApplication( "application/x-vnd.OBeOS.Media" ) +{ + BRect r; + + r.Set( 100, 100, 200, 300 ); + window = new MediaPrefsWindow( r ); + window->Show(); +} + + +int +main( int argc, char **argv ) +{ + MediaPrefsApp app; + + app.Run(); + return 0; +} diff --git a/src/prefs/media/old/MediaPrefsApp.h b/src/prefs/media/old/MediaPrefsApp.h new file mode 100644 index 0000000000..756433ab4d --- /dev/null +++ b/src/prefs/media/old/MediaPrefsApp.h @@ -0,0 +1,12 @@ +#include + +#include "MediaPrefsWindow.h" + +class MediaPrefsApp : public BApplication { + + public: + MediaPrefsApp(); + + private: + MediaPrefsWindow *window; +}; diff --git a/src/prefs/media/old/MediaPrefsSlider.cpp b/src/prefs/media/old/MediaPrefsSlider.cpp new file mode 100644 index 0000000000..1e63e013d8 --- /dev/null +++ b/src/prefs/media/old/MediaPrefsSlider.cpp @@ -0,0 +1,9 @@ +#include "MediaPrefsSlider.h" +//#include "VolumeControl.h" + + +MediaPrefsSlider::MediaPrefsSlider( BRect r, const char *name, const char *label, BMessage *model, + int32 channels, uint32 resize, uint32 flags ) + : BChannelSlider( r, name, label, model, B_VERTICAL, channels, resize, flags ) +{ +} diff --git a/src/prefs/media/old/MediaPrefsSlider.h b/src/prefs/media/old/MediaPrefsSlider.h new file mode 100644 index 0000000000..6ddcd8fec6 --- /dev/null +++ b/src/prefs/media/old/MediaPrefsSlider.h @@ -0,0 +1,10 @@ +#include + +#define vI2F (float)(9.999 / 100) + +class MediaPrefsSlider : public BChannelSlider { + + public: + MediaPrefsSlider( BRect r, const char *name, const char *label, BMessage *model, + int32 channels, uint32 resize, uint32 flags ); +}; diff --git a/src/prefs/media/old/MediaPrefsView.cpp b/src/prefs/media/old/MediaPrefsView.cpp new file mode 100644 index 0000000000..1b81e3e3e9 --- /dev/null +++ b/src/prefs/media/old/MediaPrefsView.cpp @@ -0,0 +1,7 @@ +#include "MediaPrefsView.h" + + +MediaPrefsView::MediaPrefsView( BRect r, char *name ) + : BView( r, name, B_FOLLOW_ALL_SIDES, B_WILL_DRAW ) +{ +} diff --git a/src/prefs/media/old/MediaPrefsView.h b/src/prefs/media/old/MediaPrefsView.h new file mode 100644 index 0000000000..54dbfc0e9c --- /dev/null +++ b/src/prefs/media/old/MediaPrefsView.h @@ -0,0 +1,8 @@ +#include + +class MediaPrefsView : public BView { + + public: + MediaPrefsView( BRect r, char *name ); + +}; diff --git a/src/prefs/media/old/MediaPrefsWindow.cpp b/src/prefs/media/old/MediaPrefsWindow.cpp new file mode 100644 index 0000000000..a8cc6d2ff3 --- /dev/null +++ b/src/prefs/media/old/MediaPrefsWindow.cpp @@ -0,0 +1,65 @@ +#include "MediaPrefsApp.h" +//#include "VolumeControl.h" + + +MediaPrefsWindow::MediaPrefsWindow( BRect wRect ) + : BWindow( wRect, "Media", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS ) +{ + float fLeft, fRight; + int32 iLeft, iRight; + + wRect.OffsetTo( B_ORIGIN ); + view = new MediaPrefsView( wRect, "MainView" ); + view->SetViewColor( ui_color( B_PANEL_BACKGROUND_COLOR ) ); + + this->AddChild( view ); + + slider = new MediaPrefsSlider( wRect, "MasterVol", "Master", + new BMessage( 'mVol' ), 2, + B_FOLLOW_LEFT|B_FOLLOW_TOP, B_WILL_DRAW ); + slider->SetLimits( 0, 100 ); + slider->SetLimitLabels( "0", "100" ); + + view->AddChild( slider ); + + // use private API +// if ( MediaKitPrivate::GetMasterVolume( &fLeft, &fRight ) == B_OK ) { +// // left,right range is 0..9.999 +// iLeft = (int32)( fLeft / vI2F ); +// iRight = (int32)( fRight / vI2F ); +// } else { + iLeft = 0; + iRight = 0; +// } + + slider->SetValueFor( 0, iLeft ); + slider->SetValueFor( 1, iRight ); +} + + +bool MediaPrefsWindow::QuitRequested() +{ + be_app->PostMessage( B_QUIT_REQUESTED ); + return true; +} + + +void MediaPrefsWindow::MessageReceived( BMessage *msg ) +{ + switch ( msg->what ) { + case 'mVol': + { + int32 iLeft = slider->ValueFor( 0 ); + int32 iRight = slider->ValueFor( 1 ); + + float fLeft = float( iLeft ) * vI2F; + float fRight = float( iRight ) * vI2F; + +// MediaKitPrivate::SetMasterVolume( fLeft, fRight ); + } + break; + + default: + BWindow::MessageReceived( msg ); + } +} diff --git a/src/prefs/media/old/MediaPrefsWindow.h b/src/prefs/media/old/MediaPrefsWindow.h new file mode 100644 index 0000000000..d6d6af255a --- /dev/null +++ b/src/prefs/media/old/MediaPrefsWindow.h @@ -0,0 +1,17 @@ +#include + +#include "MediaPrefsView.h" +#include "MediaPrefsSlider.h" + + +class MediaPrefsWindow : public BWindow { + + public: + MediaPrefsWindow( BRect wRect ); + virtual bool QuitRequested(); + virtual void MessageReceived( BMessage *msg ); + + private: + MediaPrefsView *view; + MediaPrefsSlider *slider; +};