Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
909088e8
Commit
909088e8
authored
19 years ago
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wince: some more code cleanup + fixes.
parent
67099af7
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
212 additions
and
377 deletions
+212
-377
modules/gui/wince/fileinfo.cpp
modules/gui/wince/fileinfo.cpp
+10
-18
modules/gui/wince/interface.cpp
modules/gui/wince/interface.cpp
+75
-85
modules/gui/wince/iteminfo.cpp
modules/gui/wince/iteminfo.cpp
+9
-17
modules/gui/wince/messages.cpp
modules/gui/wince/messages.cpp
+14
-21
modules/gui/wince/open.cpp
modules/gui/wince/open.cpp
+13
-38
modules/gui/wince/playlist.cpp
modules/gui/wince/playlist.cpp
+43
-71
modules/gui/wince/preferences.cpp
modules/gui/wince/preferences.cpp
+16
-28
modules/gui/wince/subtitles.cpp
modules/gui/wince/subtitles.cpp
+10
-19
modules/gui/wince/video.cpp
modules/gui/wince/video.cpp
+9
-27
modules/gui/wince/wince.cpp
modules/gui/wince/wince.cpp
+1
-3
modules/gui/wince/wince.h
modules/gui/wince/wince.h
+12
-29
modules/gui/wince/wince_rc.rc
modules/gui/wince/wince_rc.rc
+0
-21
No files found.
modules/gui/wince/fileinfo.cpp
View file @
909088e8
...
...
@@ -191,15 +191,10 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
FileInfo
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
FileInfo
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -211,25 +206,22 @@ LRESULT FileInfo::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
CreateTreeView
(
hwnd
);
UpdateWindow
(
hwnd
);
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
if
(
LOWORD
(
wp
)
==
IDOK
)
{
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
}
break
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
This diff is collapsed.
Click to expand it.
modules/gui/wince/interface.cpp
View file @
909088e8
This diff is collapsed.
Click to expand it.
modules/gui/wince/iteminfo.cpp
View file @
909088e8
...
...
@@ -65,18 +65,13 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
ItemInfoDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
ItemInfoDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
SHMENUBARINFO
mbi
;
INITCOMMONCONTROLSEX
iccex
;
RECT
rcClient
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -155,28 +150,25 @@ LRESULT ItemInfoDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
hwnd
,
NULL
,
hInst
,
NULL
);
UpdateInfo
();
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
if
(
LOWORD
(
wp
)
==
IDOK
)
{
OnOk
();
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
/*****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/messages.cpp
View file @
909088e8
...
...
@@ -69,8 +69,7 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
Messages
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
Messages
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
...
...
@@ -79,11 +78,7 @@ LRESULT Messages::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
int
i_dummy
;
HANDLE
fichier
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
switch
(
msg
)
{
case
WM_INITDIALOG
:
shidi
.
dwMask
=
SHIDIM_FLAGS
;
...
...
@@ -116,22 +111,26 @@ LRESULT Messages::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
SetTimer
(
hwnd
,
1
,
500
/*milliseconds*/
,
NULL
);
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
return
lResult
;
break
;
case
WM_TIMER
:
UpdateLog
();
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
switch
(
LOWORD
(
wp
)
)
{
case
IDOK
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
break
;
case
IDCLEAR
:
ListView_DeleteAllItems
(
hListView
);
return
TRUE
;
break
;
case
IDSAVEAS
:
memset
(
&
(
ofn
),
0
,
sizeof
(
ofn
)
);
...
...
@@ -170,23 +169,17 @@ LRESULT Messages::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
}
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
return
TRUE
;
break
;
default:
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
void
Messages
::
UpdateLog
()
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/open.cpp
View file @
909088e8
...
...
@@ -93,8 +93,7 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
OpenDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
OpenDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
SHMENUBARINFO
mbi
;
...
...
@@ -102,10 +101,6 @@ LRESULT OpenDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
RECT
rcClient
;
TC_ITEM
tcItem
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -153,7 +148,6 @@ LRESULT OpenDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
0
,
hInst
,
0
);
// No tooltips for ComboBox
label
=
CreateWindow
(
_T
(
"STATIC"
),
_FROMMB
(
_
(
"Alternatively, you can build an MRL "
"using one of the following predefined "
...
...
@@ -193,48 +187,45 @@ LRESULT OpenDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
NetPanel
(
hwnd
);
OnPageChange
();
break
;
return
lResult
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
if
(
LOWORD
(
wp
)
==
IDOK
)
{
OnOk
();
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
break
;
}
if
(
HIWORD
(
wp
)
==
BN_CLICKED
)
{
if
(
(
HWND
)
lp
==
net_radios
[
0
]
)
{
OnNetTypeChange
(
NetRadio1_Event
);
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
net_radios
[
1
]
)
{
OnNetTypeChange
(
NetRadio2_Event
);
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
net_radios
[
2
]
)
{
OnNetTypeChange
(
NetRadio3_Event
);
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
net_radios
[
3
]
)
{
OnNetTypeChange
(
NetRadio4_Event
);
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
subsfile_checkbox
)
{
OnSubsFileEnable
();
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
subsfile_button
)
{
OnSubsFileSettings
(
hwnd
);
return
TRUE
;
}
else
if
(
(
HWND
)
lp
==
browse_button
)
{
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
OnFileBrowse
();
return
TRUE
;
}
break
;
}
if
(
HIWORD
(
wp
)
==
EN_CHANGE
)
{
...
...
@@ -262,31 +253,17 @@ LRESULT OpenDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
OnFilePanelChange
();
}
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
case
WM_NOTIFY
:
if
(
(((
NMHDR
*
)
lp
)
->
code
)
==
TCN_SELCHANGE
)
{
OnPageChange
();
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
if
(
(((
NMHDR
*
)
lp
)
->
code
)
==
TCN_SELCHANGE
)
OnPageChange
();
break
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
/*****************************************************************************
...
...
@@ -826,9 +803,7 @@ void OpenDialog::OnSubsFileSettings( HWND hwnd )
/* Show/hide the open dialog */
SubsFileDialog
*
subsfile_dialog
=
new
SubsFileDialog
(
p_intf
,
hInst
);
DialogBoxParam
(
hInst
,
(
LPCTSTR
)
IDD_DUMMY
,
hwnd
,
(
DLGPROC
)
subsfile_dialog
->
BaseWndProc
,
(
long
)
subsfile_dialog
);
CreateDialogBox
(
hwnd
,
subsfile_dialog
);
subsfile_mrl
.
clear
();
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/playlist.cpp
View file @
909088e8
...
...
@@ -138,32 +138,23 @@ Playlist::Playlist( intf_thread_t *_p_intf, HINSTANCE _hInst )
}
/***********************************************************************
FUNCTION:
WndProc
PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
Playlist
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
Playlist
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
SHMENUBARINFO
mbi
;
INITCOMMONCONTROLSEX
iccex
;
RECT
rect
,
rectTB
;
DWORD
dwStyle
;
int
bState
;
playlist_t
*
p_playlist
;
DWORD
dwStyle
;
RECT
rect
,
rectTB
;
INITCOMMONCONTROLSEX
iccex
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -206,12 +197,7 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
sizeof
(
tbButton2
)
/
sizeof
(
TBBUTTON
),
BUTTONWIDTH
,
BUTTONHEIGHT
,
IMAGEWIDTH
,
IMAGEHEIGHT
,
sizeof
(
TBBUTTON
)
);
if
(
!
hwndTB
)
{
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
}
if
(
!
hwndTB
)
break
;
// Add ToolTips to the toolbar.
SendMessage
(
hwndTB
,
TB_SETTOOLTIPS
,
(
WPARAM
)
NUMIMAGES
,
...
...
@@ -227,12 +213,8 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
vlc_value_t
val
;
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
==
NULL
)
{
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
}
if
(
!
p_playlist
)
break
;
var_Get
(
p_playlist
,
"random"
,
&
val
);
bState
=
val
.
b_bool
?
TBSTATE_CHECKED
:
0
;
SendMessage
(
hwndTB
,
TB_SETSTATE
,
Random_Event
,
...
...
@@ -275,140 +257,141 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
SetTimer
(
hwnd
,
1
,
500
/*milliseconds*/
,
NULL
);
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
return
lResult
;
break
;
case
WM_TIMER
:
UpdatePlaylist
();
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
switch
(
LOWORD
(
wp
)
)
{
case
IDOK
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
break
;
case
ID_MANAGE_OPENPL
:
OnOpen
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
ID_MANAGE_SAVEPL
:
SHFullScreen
(
GetForegroundWindow
(),
SHFS_SHOWSIPBUTTON
);
OnSave
();
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
return
TRUE
;
break
;
case
ID_MANAGE_SIMPLEADD
:
SHFullScreen
(
GetForegroundWindow
(),
SHFS_SHOWSIPBUTTON
);
OnAddFile
();
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
ID_MANAGE_ADDMRL
:
SHFullScreen
(
GetForegroundWindow
(),
SHFS_SHOWSIPBUTTON
);
OnAddMRL
();
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
ID_SEL_DELETE
:
OnDeleteSelection
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
Infos_Event
:
SHFullScreen
(
GetForegroundWindow
(),
SHFS_SHOWSIPBUTTON
);
OnPopupInfo
(
hwnd
);
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
Up_Event
:
OnUp
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
Down_Event
:
OnDown
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
Random_Event
:
OnRandom
();
return
TRUE
;
break
;
case
Loop_Event
:
OnLoop
();
return
TRUE
;
break
;
case
Repeat_Event
:
OnRepeat
();
return
TRUE
;
break
;
case
ID_SORT_TITLE
:
OnSort
(
ID_SORT_TITLE
);
return
TRUE
;
break
;
case
ID_SORT_RTITLE
:
OnSort
(
ID_SORT_RTITLE
);
return
TRUE
;
break
;
case
ID_SORT_AUTHOR
:
OnSort
(
ID_SORT_AUTHOR
);
return
TRUE
;
break
;
case
ID_SORT_RAUTHOR
:
OnSort
(
ID_SORT_RAUTHOR
);
return
TRUE
;
break
;
case
ID_SORT_SHUFFLE
:
OnSort
(
ID_SORT_SHUFFLE
);
return
TRUE
;
break
;
case
ID_SEL_ENABLE
:
OnEnableSelection
();
return
TRUE
;
break
;
case
ID_SEL_DISABLE
:
OnDisableSelection
();
return
TRUE
;
break
;
case
ID_SEL_INVERT
:
OnInvertSelection
();
return
TRUE
;
break
;
case
ID_SEL_SELECTALL
:
OnSelectAll
();
return
TRUE
;
break
;
case
PopupPlay_Event
:
OnPopupPlay
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
PopupDel_Event
:
OnPopupDel
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
PopupEna_Event
:
OnPopupEna
();
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
case
PopupInfo_Event
:
OnPopupInfo
(
hwnd
);
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
b_need_update
=
VLC_TRUE
;
return
TRUE
;
break
;
default:
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
case
WM_NOTIFY
:
...
...
@@ -417,40 +400,31 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
{
SetWindowLong
(
hwnd
,
DWL_MSGRESULT
,
(
LONG
)
ProcessCustomDraw
(
lp
)
);
return
TRUE
;
}
else
if
(
(
((
LPNMHDR
)
lp
)
->
hwndFrom
==
hListView
)
&&
(
((
LPNMHDR
)
lp
)
->
code
==
GN_CONTEXTMENU
)
)
{
HandlePopupMenu
(
hwnd
,
((
PNMRGINFO
)
lp
)
->
ptAction
);
return
TRUE
;
}
else
if
(
(
((
LPNMHDR
)
lp
)
->
hwndFrom
==
hListView
)
&&
(
((
LPNMHDR
)
lp
)
->
code
==
LVN_COLUMNCLICK
)
)
{
OnColSelect
(
((
LPNMLISTVIEW
)
lp
)
->
iSubItem
);
return
TRUE
;
}
else
if
(
(
((
LPNMHDR
)
lp
)
->
hwndFrom
==
hListView
)
&&
(
((
LPNMHDR
)
lp
)
->
code
==
LVN_ITEMACTIVATE
)
)
{
OnActivateItem
(
((
LPNMLISTVIEW
)
lp
)
->
iSubItem
);
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
LRESULT
Playlist
::
ProcessCustomDraw
(
LPARAM
lParam
)
...
...
@@ -886,9 +860,7 @@ void Playlist::ShowInfos( HWND hwnd, int i_item )
{
ItemInfoDialog
*
iteminfo_dialog
=
new
ItemInfoDialog
(
p_intf
,
hInst
,
p_item
);
DialogBoxParam
(
hInst
,
(
LPCTSTR
)
IDD_DUMMY
,
hwnd
,
(
DLGPROC
)
iteminfo_dialog
->
BaseWndProc
,
(
long
)
iteminfo_dialog
);
CreateDialogBox
(
hwnd
,
iteminfo_dialog
);
UpdateItem
(
i_item
);
delete
iteminfo_dialog
;
}
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/preferences.cpp
View file @
909088e8
...
...
@@ -160,17 +160,12 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
PrefsDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
PrefsDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
SHMENUBARINFO
mbi
;
RECT
rcClient
;
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -228,32 +223,30 @@ LRESULT PrefsDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
prefs_tree
=
new
PrefsTreeCtrl
(
p_intf
,
this
,
hwnd
,
hInst
);
UpdateWindow
(
hwnd
);
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
if
(
LOWORD
(
wp
)
==
IDOK
)
{
OnOk
();
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
case
WM_NOTIFY
:
if
(
(
((
LPNMHDR
)
lp
)
->
hwndFrom
==
prefs_tree
->
hwndTV
)
&&
(
((
LPNMHDR
)
lp
)
->
code
==
TVN_SELCHANGED
)
)
if
(
lp
&&
prefs_tree
&&
((
LPNMHDR
)
lp
)
->
hwndFrom
==
prefs_tree
->
hwndTV
&&
((
LPNMHDR
)
lp
)
->
code
==
TVN_SELCHANGED
)
{
prefs_tree
->
OnSelectTreeItem
(
(
NM_TREEVIEW
FAR
*
)(
LPNMHDR
)
lp
,
hwnd
,
hInst
);
return
TRUE
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
case
WM_VSCROLL
:
{
...
...
@@ -261,7 +254,8 @@ LRESULT PrefsDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
tvi
.
mask
=
TVIF_PARAM
;
tvi
.
hItem
=
TreeView_GetSelection
(
prefs_tree
->
hwndTV
);
TreeView_GetItem
(
prefs_tree
->
hwndTV
,
&
tvi
);
ConfigTreeData
*
config_data
=
prefs_tree
->
FindModuleConfig
(
(
ConfigTreeData
*
)
tvi
.
lParam
);
ConfigTreeData
*
config_data
=
prefs_tree
->
FindModuleConfig
(
(
ConfigTreeData
*
)
tvi
.
lParam
);
if
(
hwnd
==
config_data
->
panel
->
config_window
)
{
int
dy
;
...
...
@@ -288,20 +282,14 @@ LRESULT PrefsDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
config_data
->
panel
->
oldvalue
=
newvalue
;
}
break
;
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
/*****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/subtitles.cpp
View file @
909088e8
...
...
@@ -62,8 +62,7 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
SubsFileDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
SubsFileDialog
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
SHINITDLGINFO
shidi
;
SHMENUBARINFO
mbi
;
...
...
@@ -77,10 +76,6 @@ LRESULT SubsFileDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
TCHAR
psz_text
[
256
];
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
case
WM_INITDIALOG
:
...
...
@@ -224,7 +219,11 @@ LRESULT SubsFileDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
UDS_SETBUDDYINT
|
UDS_NOTHOUSANDS
,
0
,
0
,
0
,
0
,
hwnd
,
0
,
hInst
,
fps_edit
,
16000
,
0
,
(
int
)
f_fps
);
return
lResult
;
break
;
case
WM_CLOSE
:
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
break
;
case
WM_COMMAND
:
if
(
LOWORD
(
wp
)
==
IDOK
)
...
...
@@ -255,7 +254,7 @@ LRESULT SubsFileDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
subsfile_mrl
.
push_back
(
szFps
);
EndDialog
(
hwnd
,
LOWORD
(
wp
)
);
return
TRUE
;
break
;
}
if
(
HIWORD
(
wp
)
==
BN_CLICKED
)
{
...
...
@@ -263,23 +262,15 @@ LRESULT SubsFileDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
{
SHFullScreen
(
GetForegroundWindow
(),
SHFS_HIDESIPBUTTON
);
OnFileBrowse
();
return
TRUE
;
}
}
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
break
;
}
return
lResult
;
return
FALSE
;
}
/*****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/video.cpp
View file @
909088e8
...
...
@@ -52,7 +52,7 @@ class VideoWindow : public CBaseWindow
{
public:
/* Constructor */
VideoWindow
(
intf_thread_t
*
_p_intf
,
H
INSTANCE
_hInst
,
H
WND
_p_parent
);
VideoWindow
(
intf_thread_t
*
_p_intf
,
HWND
_p_parent
);
virtual
~
VideoWindow
();
void
*
GetWindow
(
vout_thread_t
*
,
int
*
,
int
*
,
unsigned
int
*
,
...
...
@@ -68,24 +68,21 @@ private:
HWND
p_parent
;
vlc_mutex_t
lock
;
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
};
/*****************************************************************************
* Public methods.
*****************************************************************************/
CBaseWindow
*
CreateVideoWindow
(
intf_thread_t
*
p_intf
,
HINSTANCE
hInst
,
HWND
p_parent
)
CBaseWindow
*
CreateVideoWindow
(
intf_thread_t
*
p_intf
,
HWND
p_parent
)
{
return
new
VideoWindow
(
p_intf
,
hInst
,
p_parent
);
return
new
VideoWindow
(
p_intf
,
p_parent
);
}
/*****************************************************************************
* Constructor.
*****************************************************************************/
VideoWindow
::
VideoWindow
(
intf_thread_t
*
_p_intf
,
HINSTANCE
_hInst
,
HWND
_p_parent
)
VideoWindow
::
VideoWindow
(
intf_thread_t
*
_p_intf
,
HWND
_p_parent
)
{
RECT
rect
;
WNDCLASS
wc
;
...
...
@@ -111,7 +108,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HINSTANCE _hInst,
wc
.
cbClsExtra
=
0
;
wc
.
cbWndExtra
=
0
;
wc
.
hIcon
=
NULL
;
wc
.
hInstance
=
_hInst
;
wc
.
hInstance
=
GetModuleHandle
(
0
)
;
wc
.
hCursor
=
NULL
;
wc
.
hbrBackground
=
(
HBRUSH
)
GetStockObject
(
BLACK_BRUSH
);
wc
.
lpszMenuName
=
NULL
;
...
...
@@ -122,7 +119,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HINSTANCE _hInst,
_T
(
"VIDEOWINDOW"
),
_T
(
""
),
WS_CHILD
|
WS_VISIBLE
|
WS_BORDER
,
0
,
20
,
rect
.
right
-
rect
.
left
,
rect
.
bottom
-
rect
.
top
-
2
*
(
MENU_HEIGHT
-
1
)
-
SLIDER_HEIGHT
-
20
,
p_parent
,
NULL
,
_hInst
,
(
void
*
)
this
);
p_parent
,
NULL
,
GetModuleHandle
(
0
)
,
(
void
*
)
this
);
ShowWindow
(
p_child_window
,
SW_SHOW
);
UpdateWindow
(
p_child_window
);
...
...
@@ -193,24 +190,9 @@ PURPOSE:
Processes messages sent to the main window.
***********************************************************************/
LRESULT
VideoWindow
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
)
LRESULT
VideoWindow
::
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
LRESULT
lResult
=
CBaseWindow
::
WndProc
(
hwnd
,
msg
,
wp
,
lp
,
pbProcessed
);
BOOL
bWasProcessed
=
*
pbProcessed
;
*
pbProcessed
=
TRUE
;
switch
(
msg
)
{
default:
// the message was not processed
// indicate if the base class handled it
*
pbProcessed
=
bWasProcessed
;
lResult
=
FALSE
;
return
lResult
;
}
return
lResult
;
return
DefWindowProc
(
hwnd
,
msg
,
wp
,
lp
);
}
static
int
ControlWindow
(
intf_thread_t
*
p_intf
,
void
*
p_window
,
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/wince.cpp
View file @
909088e8
...
...
@@ -147,10 +147,8 @@ static void Run( intf_thread_t *p_intf )
if
(
!
pInterface
->
InitInstance
(
hInstance
,
p_intf
)
)
return
;
// Main message loop
int
status
;
while
(
(
status
=
GetMessage
(
&
msg
,
NULL
,
0
,
0
)
)
!=
0
)
while
(
GetMessage
(
&
msg
,
NULL
,
0
,
0
)
>
0
)
{
if
(
status
==
-
1
)
return
;
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
}
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/wince.h
View file @
909088e8
...
...
@@ -97,10 +97,9 @@ public:
virtual
~
CBaseWindow
()
{};
HWND
hWnd
;
// The main window handle
BOOL
DlgFlag
;
// True if object is a dialog window
static
LRESULT
CALLBACK
BaseWndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
);
static
LRESULT
CALLBACK
BaseWndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
static
int
CreateDialogBox
(
HWND
,
CBaseWindow
*
);
protected:
...
...
@@ -108,9 +107,7 @@ protected:
HWND
hwndCB
;
// The command bar handle
HINSTANCE
GetInstance
()
const
{
return
hInst
;
}
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
){
*
pbProcessed
=
FALSE
;
return
0
;}
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
)
=
0
;
};
class
FileInfo
;
...
...
@@ -120,7 +117,7 @@ class Timer;
class
OpenDialog
;
class
PrefsDialog
;
CBaseWindow
*
CreateVideoWindow
(
intf_thread_t
*
,
H
INSTANCE
,
H
WND
);
CBaseWindow
*
CreateVideoWindow
(
intf_thread_t
*
,
HWND
);
/* Main Interface */
class
Interface
:
public
CBaseWindow
...
...
@@ -155,8 +152,7 @@ public:
protected:
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
void
OnOpenFileSimple
(
void
);
void
OnPlayStream
(
void
);
...
...
@@ -193,8 +189,7 @@ protected:
TCHAR
szFileInfoClassName
[
100
];
// Main window class name
TCHAR
szFileInfoTitle
[
100
];
// Main window name
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
void
UpdateFileInfo
(
HWND
);
BOOL
CreateTreeView
(
HWND
);
};
...
...
@@ -211,9 +206,7 @@ protected:
intf_thread_t
*
p_intf
;
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
HWND
hListView
;
void
UpdateLog
(
void
);
...
...
@@ -240,9 +233,7 @@ protected:
void
OnOk
();
void
UpdateInfo
();
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
/* Controls for the iteminfo dialog box */
HWND
uri_label
;
...
...
@@ -274,9 +265,7 @@ protected:
intf_thread_t
*
p_intf
;
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
HWND
mrl_box
;
HWND
mrl_label
;
...
...
@@ -359,9 +348,7 @@ protected:
HWND
fps_edit
;
HWND
fps_spinctrl
;
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
/* Event handlers (these functions should _not_ be virtual) */
void
OnFileBrowse
();
...
...
@@ -424,9 +411,7 @@ protected:
void
OnPopupEna
();
void
OnPopupInfo
(
HWND
hwnd
);
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
};
/* Timer */
...
...
@@ -513,9 +498,7 @@ protected:
PrefsTreeCtrl
*
prefs_tree
;
virtual
LRESULT
WndProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
,
PBOOL
pbProcessed
);
virtual
LRESULT
WndProc
(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
};
/*****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
modules/gui/wince/wince_rc.rc
View file @
909088e8
...
...
@@ -187,27 +187,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DUMMY DIALOG DISCARDABLE 0, 0, 186, 90
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dummy"
FONT 8, "System"
BEGIN
END
IDD_MESSAGES DIALOG DISCARDABLE 0, 0, 138, 90
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Messages"
FONT 8, "System"
BEGIN
PUSHBUTTON "Save as...",IDSAVEAS,76,7,50,14
PUSHBUTTON "Clear",IDCLEAR,11,7,50,14
END
/////////////////////////////////////////////////////////////////////////////
//
// Menubar
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment