diff --git a/src/prefs/media/images/devices.tga b/src/prefs/media/images/devices.tga deleted file mode 100644 index ac96241efa..0000000000 Binary files a/src/prefs/media/images/devices.tga and /dev/null differ diff --git a/src/prefs/media/images/mixer.tga b/src/prefs/media/images/mixer.tga deleted file mode 100644 index 09e2d555c2..0000000000 Binary files a/src/prefs/media/images/mixer.tga and /dev/null differ diff --git a/src/prefs/media/images/tv.tga b/src/prefs/media/images/tv.tga deleted file mode 100644 index b5dba1af54..0000000000 Binary files a/src/prefs/media/images/tv.tga and /dev/null differ diff --git a/src/prefs/media/old/MediaPrefsApp.cpp b/src/prefs/media/old/MediaPrefsApp.cpp deleted file mode 100644 index 7b65fd2887..0000000000 --- a/src/prefs/media/old/MediaPrefsApp.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#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 deleted file mode 100644 index 756433ab4d..0000000000 --- a/src/prefs/media/old/MediaPrefsApp.h +++ /dev/null @@ -1,12 +0,0 @@ -#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 deleted file mode 100644 index 1e63e013d8..0000000000 --- a/src/prefs/media/old/MediaPrefsSlider.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#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 deleted file mode 100644 index 6ddcd8fec6..0000000000 --- a/src/prefs/media/old/MediaPrefsSlider.h +++ /dev/null @@ -1,10 +0,0 @@ -#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 deleted file mode 100644 index 1b81e3e3e9..0000000000 --- a/src/prefs/media/old/MediaPrefsView.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#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 deleted file mode 100644 index 54dbfc0e9c..0000000000 --- a/src/prefs/media/old/MediaPrefsView.h +++ /dev/null @@ -1,8 +0,0 @@ -#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 deleted file mode 100644 index a8cc6d2ff3..0000000000 --- a/src/prefs/media/old/MediaPrefsWindow.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#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 deleted file mode 100644 index d6d6af255a..0000000000 --- a/src/prefs/media/old/MediaPrefsWindow.h +++ /dev/null @@ -1,17 +0,0 @@ -#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; -};