i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup, moved track selection into settings

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17219 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-04-23 22:09:37 +00:00
parent 067423e615
commit 91b9ff3f99
2 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/MainWin.cpp
+4 -17
View File
@@ -101,9 +101,6 @@ MainWin::MainWin()
, fWidthScale(1.0) , fWidthScale(1.0)
, fHeightScale(1.0) , fHeightScale(1.0)
, fMouseDownTracking(false) , fMouseDownTracking(false)
, fFrameResizedTriggeredAutomatically(false)
, fIgnoreFrameResized(false)
, fFrameResizedCalled(true)
{ {
static int pos = 0; static int pos = 0;
MoveBy(pos * 25, pos * 25); MoveBy(pos * 25, pos * 25);
@@ -217,7 +214,7 @@ MainWin::SetupWindow()
void void
MainWin::ResizeWindow(float percent) MainWin::ResizeWindow(int percent)
{ {
int video_width; int video_width;
int video_height; 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("Close", new BMessage(M_FILE_CLOSE), 'W', B_COMMAND_KEY));
fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q', 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("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("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)); fViewMenu->AddItem(new BMenuItem("200% scale", new BMessage(M_VIEW_200), '2', B_COMMAND_KEY));
@@ -286,7 +280,9 @@ MainWin::CreateMenu()
// fViewMenu->AddSeparatorItem(); // fViewMenu->AddSeparatorItem();
// fViewMenu->AddItem(new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY)); // 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 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 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)); 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 void
MainWin::ResizeVideoView(int x, int y, int width, int height) MainWin::ResizeVideoView(int x, int y, int width, int height)
{ {
src/apps/mediaplayer/MainWin.h
+1 -7
View File
@@ -52,14 +52,12 @@ public:
void SetupWindow(); void SetupWindow();
void SetupTrackMenus(); void SetupTrackMenus();
void SetWindowSizeLimits(); void SetWindowSizeLimits();
void ResizeWindow(float percent); void ResizeWindow(int percent);
void ResizeVideoView(int x, int y, int width, int height); void ResizeVideoView(int x, int y, int width, int height);
void ShowFileInfo(); void ShowFileInfo();
void VideoFormatChange(int width, int height, float width_scale, float height_scale); void VideoFormatChange(int width, int height, float width_scale, float height_scale);
void UpdateWindowTitle();
void ToggleFullscreen(); void ToggleFullscreen();
void ToggleKeepAspectRatio(); void ToggleKeepAspectRatio();
@@ -105,10 +103,6 @@ public:
bool fMouseDownTracking; bool fMouseDownTracking;
BPoint fMouseDownMousePos; BPoint fMouseDownMousePos;
BPoint fMouseDownWindowPos; BPoint fMouseDownWindowPos;
bool fFrameResizedTriggeredAutomatically;
bool fIgnoreFrameResized;
bool fFrameResizedCalled;
BRect fVideoViewBounds;
}; };
#endif #endif