调整界面布局

tsingsee · Aug 17, 2016 · 5faf573 · 5faf573
1 parent 74fc16a
commit 5faf573
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/win32/EasyPlayer/DlgRender.cpp b/win32/EasyPlayer/DlgRender.cpp
@@ -69,10 +69,6 @@ void CDlgRender::OnRButtonUp(UINT nFlags, CPoint point)
 	if (NULL != hMenu)
 	{
 		AppendMenu(hMenu, MF_STRING|(channelStatus.recording==0x01?MF_CHECKED:MF_UNCHECKED), POP_MENU_RECORDING, TEXT("Recording"));
-
-
-
-
 		CPoint	pMousePosition;
 		GetCursorPos(&pMousePosition);
 		SetForegroundWindow();
@@ -104,7 +100,6 @@ BOOL CDlgRender::OnCommand(WPARAM wParam, LPARAM lParam)
 		break;
 	}
 
-
 	return CDialogEx::OnCommand(wParam, lParam);
 }
 

diff --git a/win32/EasyPlayer/DlgVideo.cpp b/win32/EasyPlayer/DlgVideo.cpp
@@ -220,7 +220,7 @@ void	CDlgVideo::UpdateComponents()
 	if (NULL != pDlgRender)		pDlgRender->Invalidate();
 
 	CRect	rcURL;
-	rcURL.SetRect(rcClient.left, rcRender.bottom+2, rcClient.right-232, rcClient.bottom);
+	rcURL.SetRect(rcClient.left, rcRender.bottom+2, rcClient.right-272, rcClient.bottom);
 	__MOVE_WINDOW(pEdtURL, rcURL);
 	if (NULL != pEdtURL)		pEdtURL->Invalidate();
 
@@ -236,12 +236,12 @@ void	CDlgVideo::UpdateComponents()
 
 	// RTP OVER TCP/UDP [8/17/2016 SwordTwelve]
 	CRect	rcRTPMode;
-	rcRTPMode.SetRect(rcURL.right+10, rcURL.top, rcURL.right+2+48, rcURL.bottom);
+	rcRTPMode.SetRect(rcURL.right+10, rcURL.top, rcURL.right+2+68, rcURL.bottom);
 	__MOVE_WINDOW(pChkRTPTransMode, rcRTPMode);
 	if (NULL != pChkRTPTransMode)		pChkRTPTransMode->Invalidate();	
 
 	CRect	rcOSD;
-	rcOSD.SetRect(rcRTPMode.right+10, rcRTPMode.top, rcRTPMode.right+2+48, rcRTPMode.bottom);
+	rcOSD.SetRect(rcRTPMode.right+10, rcRTPMode.top, rcRTPMode.right+2+68, rcRTPMode.bottom);
 	__MOVE_WINDOW(pChkOSD, rcOSD);
 	if (NULL != pChkOSD)		pChkOSD->Invalidate();
 

diff --git a/win32/libEasyPlayer/libEasyPlayerAPI.h b/win32/libEasyPlayer/libEasyPlayerAPI.h
@@ -6,8 +6,6 @@
 	Author: Gavin@easydarwin.org
 */
 
-
-
 #ifndef __LIB_EASY_PLAYER_API_H__
 #define __LIB_EASY_PLAYER_API_H__
 
@@ -32,15 +30,11 @@ typedef enum __RENDER_FORMAT
 	DISPLAY_FORMAT_RGB24_GDI=		26
 }RENDER_FORMAT;
 
-
-
 typedef int (CALLBACK *MediaSourceCallBack)( int _channelId, int *_channelPtr, int _frameType, char *pBuf, RTSP_FRAME_INFO* _frameInfo);
 
-
 LIB_EASYPLAYER_API int EasyPlayer_Init();
 LIB_EASYPLAYER_API void EasyPlayer_Release();
 
-
 LIB_EASYPLAYER_API int EasyPlayer_OpenStream(const char *url, HWND hWnd, RENDER_FORMAT renderFormat, int rtpovertcp, const char *username, const char *password, MediaSourceCallBack callback=NULL, void *userPtr=NULL);
 LIB_EASYPLAYER_API void EasyPlayer_CloseStream(int channelId);
 LIB_EASYPLAYER_API int EasyPlayer_SetFrameCache(int channelId, int cache);
@@ -59,7 +53,4 @@ LIB_EASYPLAYER_API int EasyPlayer_StopManuRecording(int channelId);
 LIB_EASYPLAYER_API int EasyPlayer_PlaySound(int channelId);
 LIB_EASYPLAYER_API int EasyPlayer_StopSound();
 
-
-
-
 #endif