From 91b9ff3f99ab334db0b4cabc08625245d47f3025 Mon Sep 17 00:00:00 2001
From: Marcus Overhagen <marcusoverhagen@gmail.com>
Date: Sun, 23 Apr 2006 22:09:37 +0000
Subject: [PATCH] cleanup, moved track selection into settings

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17219 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/mediaplayer/MainWin.cpp | 21 ++++-----------------
 src/apps/mediaplayer/MainWin.h   |  8 +-------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index b2756fe677..f3980795b5 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -101,9 +101,6 @@ MainWin::MainWin()
  ,	fWidthScale(1.0)
  ,	fHeightScale(1.0)
  ,	fMouseDownTracking(false)
- ,	fFrameResizedTriggeredAutomatically(false)
- ,	fIgnoreFrameResized(false)
- ,	fFrameResizedCalled(true)
 {
 	static int pos = 0;
 	MoveBy(pos * 25, pos * 25);
@@ -217,7 +214,7 @@ MainWin::SetupWindow()
 
 
 void
-MainWin::ResizeWindow(float percent)
+MainWin::ResizeWindow(int percent)
 {
 	int video_width;
 	int video_height;
@@ -272,9 +269,6 @@ MainWin::CreateMenu()
 	fFileMenu->AddItem(new BMenuItem("Close", new BMessage(M_FILE_CLOSE), 'W', B_COMMAND_KEY));
 	fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY));
 
-	fViewMenu->AddItem(fAudioMenu);
-	fViewMenu->AddItem(fVideoMenu);
-	fViewMenu->AddSeparatorItem();
 	fViewMenu->AddItem(new BMenuItem("50% scale", new BMessage(M_VIEW_50), '0', B_COMMAND_KEY));
 	fViewMenu->AddItem(new BMenuItem("100% scale", new BMessage(M_VIEW_100), '1', B_COMMAND_KEY));
 	fViewMenu->AddItem(new BMenuItem("200% scale", new BMessage(M_VIEW_200), '2', B_COMMAND_KEY));
@@ -286,7 +280,9 @@ MainWin::CreateMenu()
 //	fViewMenu->AddSeparatorItem();
 //	fViewMenu->AddItem(new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
 
-//	fSettingsMenu->AddSeparatorItem();
+	fSettingsMenu->AddItem(fAudioMenu);
+	fSettingsMenu->AddItem(fVideoMenu);
+	fSettingsMenu->AddSeparatorItem();
 	fSettingsMenu->AddItem(new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
 	fSettingsMenu->AddItem(new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
 	fSettingsMenu->AddItem(new BMenuItem("No Controls", new BMessage(M_TOGGLE_NO_CONTROLS), 'C', B_COMMAND_KEY));
@@ -587,15 +583,6 @@ MainWin::ShowFileInfo()
 }
 
 
-void
-MainWin::UpdateWindowTitle()
-{
-	char buf[100];
-	sprintf(buf, "%s - %d x %d, %.3f:%.3f => %.0f x %.0f", NAME, fSourceWidth, fSourceHeight, fWidthScale, fHeightScale, fVideoView->Bounds().Width() + 1, fVideoView->Bounds().Height() + 1);
-	SetTitle(buf);
-}
-
-
 void
 MainWin::ResizeVideoView(int x, int y, int width, int height)
 {
diff --git a/src/apps/mediaplayer/MainWin.h b/src/apps/mediaplayer/MainWin.h
index 73de42490f..df4a0f54cb 100644
--- a/src/apps/mediaplayer/MainWin.h
+++ b/src/apps/mediaplayer/MainWin.h
@@ -52,14 +52,12 @@ public:
 	void				SetupWindow();
 	void				SetupTrackMenus();
 	void				SetWindowSizeLimits();
-	void				ResizeWindow(float percent);
+	void				ResizeWindow(int percent);
 	void				ResizeVideoView(int x, int y, int width, int height);
 	
 	void				ShowFileInfo();
 	
 	void				VideoFormatChange(int width, int height, float width_scale, float height_scale);
-
-	void				UpdateWindowTitle();
 	
 	void				ToggleFullscreen();
 	void				ToggleKeepAspectRatio();
@@ -105,10 +103,6 @@ public:
 	bool				fMouseDownTracking;
 	BPoint				fMouseDownMousePos;
 	BPoint				fMouseDownWindowPos;
-	bool				fFrameResizedTriggeredAutomatically;
-	bool				fIgnoreFrameResized;
-	bool				fFrameResizedCalled;
-	BRect				fVideoViewBounds;
 };
 
 #endif