Navigation

← Previous Changeset
Next Changeset →

Changeset 08947dc7785e0b0e4ed1f1a9b36ce5c0fa0f43a7

Timestamp:

28/02/05 21:51:32 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1109623892 +0000

git-parent:

[953d89a977b94505a9e2d7d12221824c1dc9e63f]

git-author:

Gildas Bazin <gbazin@videolan.org> 1109623892 +0000

Message:

* modules/gui/wince: added a popup menu for the main interface.

Files:

modules/gui/wince/interface.cpp (modified) (8 diffs)
modules/gui/wince/menus.cpp (modified) (2 diffs)
modules/gui/wince/timer.cpp (modified) (2 diffs)
modules/gui/wince/wince.cpp (modified) (1 diff)
modules/gui/wince/wince.h (modified) (12 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

modules/gui/wince/interface.cpp

r953d89a	r08947dc
64	64
65	65	#define HELP_PREFS _T("Go to the preferences menu")
66		~~#define EXTRA_PREFS _T("Shows the extended GUI")~~
67	66
68	67	#define HELP_ABOUT _T("About this program")
…	…
195	194
196	195	AppendMenu( hmenu_file, MF_STRING, ID_FILE_QUICKOPEN,
197		_T("Quick &Open File") );
	196	_T("Quick &Open File...") );
198	197	AppendMenu( hmenu_file, MF_SEPARATOR, 0, 0 );
199	198	AppendMenu( hmenu_file, MF_STRING, ID_FILE_OPENFILE,
200		_T("Open &File") );
	199	_T("Open &File...") );
201	200	AppendMenu( hmenu_file, MF_STRING, ID_FILE_OPENNET,
202		_T("Open ~~Network Stream~~") );
	201	_T("Open &Network Stream...") );
203	202	AppendMenu( hmenu_file, MF_SEPARATOR, 0, 0 );
204	203	AppendMenu( hmenu_file, MF_STRING, ID_FILE_ABOUT,
…	…
208	207
209	208	AppendMenu( hmenu_view, MF_STRING, ID_VIEW_PLAYLIST,
210		_T("&Playlist") );
	209	_T("&Playlist...") );
211	210	AppendMenu( hmenu_view, MF_STRING, ID_VIEW_MESSAGES,
212		_T("&Messages") );
	211	_T("&Messages...") );
213	212	AppendMenu( hmenu_view, MF_STRING, ID_VIEW_STREAMINFO,
214		_T("&Stream and Media info") );
215
216		AppendMenu( hmenu_settings, MF_STRING, ID_SETTINGS_EXTEND,
217		_T("&Extended GUI") );
218		AppendMenu( hmenu_settings, MF_STRING, ID_SETTINGS_PREF,
	213	_T("Stream and Media &info...") );
	214
	215	AppendMenu( hmenu_settings, MF_STRING, ID_PREFERENCES,
219	216	_T("&Preferences...") );
220	217
…	…
462	459
463	460	return DialogBoxIndirectParam( GetModuleHandle(0), p_dlg_template, hwnd,
464		(DLGPROC)p_obj->BaseWndProc, (LPARAM)p_obj );
	461	(DLGPROC)p_obj->BaseWndProc, (LPARAM)p_obj );
465	462	}
466	463
…	…
482	479	p_obj = (CBaseWindow *)(((LPCREATESTRUCT)lParam)->lpCreateParams);
483	480	SetWindowLong( hwnd, GWL_USERDATA,
484		(LONG)((LPCREATESTRUCT)lParam)->lpCreateParams );
	481	(LONG)((LPCREATESTRUCT)lParam)->lpCreateParams );
485	482
486	483	p_obj->hWnd = hwnd;
…	…
541	538	case ID_FILE_QUICKOPEN:
542	539	OnOpenFileSimple();
543		break;
	540	break;
544	541
545	542	case ID_FILE_OPENFILE:
546		open = new OpenDialog( p_intf, hInst, FILE_ACCESS,
547		ID_FILE_OPENFILE, OPEN_NORMAL );
548		CreateDialogBox( hwnd, open );
549		delete open;
550		break;
	543	open = new OpenDialog( p_intf, hInst, FILE_ACCESS,
	544	ID_FILE_OPENFILE, OPEN_NORMAL );
	545	CreateDialogBox( hwnd, open );
	546	delete open;
	547	break;
551	548
552	549	case ID_FILE_OPENNET:
553	550	open = new OpenDialog( p_intf, hInst, NET_ACCESS, ID_FILE_OPENNET,
554	551	OPEN_NORMAL );
555		CreateDialogBox( hwnd, open );
	552	CreateDialogBox( hwnd, open );
556	553	delete open;
557		break;
	554	break;
558	555
559	556	case PlayStream_Event:
560	557	OnPlayStream();
561		break;
	558	break;
562	559
563	560	case StopStream_Event:
564	561	OnStopStream();
565		break;
	562	break;
566	563
567	564	case PrevStream_Event:
568	565	OnPrevStream();
569		break;
	566	break;
570	567
571	568	case NextStream_Event:
572	569	OnNextStream();
573		break;
	570	break;
574	571
575	572	case SlowStream_Event:
576	573	OnSlowStream();
577		break;
	574	break;
578	575
579	576	case FastStream_Event:
580	577	OnFastStream();
581		break;
	578	break;
582	579
583	580	case ID_FILE_ABOUT:
…	…
591	588	MessageBox( hwnd, _FROMMB(about.c_str()),
592	589	_T("About VLC media player"), MB_OK );
593		break;
	590	break;
594	591	}
595	592
596	593	case ID_FILE_EXIT:
597	594	SendMessage( hwnd, WM_CLOSE, 0, 0 );
598		break;
	595	break;
599	596
600	597	case ID_VIEW_STREAMINFO:
601	598	fi = new FileInfo( p_intf, hInst );
602		CreateDialogBox( hwnd, fi );
	599	CreateDialogBox( hwnd, fi );
603	600	delete fi;
604		break;
	601	break;
605	602
606	603	case ID_VIEW_MESSAGES:
607	604	hmsg = new Messages( p_intf, hInst );
608		CreateDialogBox( hwnd, hmsg );
	605	CreateDialogBox( hwnd, hmsg );
609	606	delete hmsg;
610		break;
	607	break;
611	608
612	609	case ID_VIEW_PLAYLIST:
613	610	pl = new Playlist( p_intf, hInst );
614		CreateDialogBox( hwnd, pl );
	611	CreateDialogBox( hwnd, pl );
615	612	delete pl;
616		break;
617
618		case ID_~~SETTINGS_PREF~~:
	613	break;
	614
	615	case ID_PREFERENCES:
619	616	pref = new PrefsDialog( p_intf, hInst );
620		CreateDialogBox( hwnd, pref );
	617	CreateDialogBox( hwnd, pref );
621	618	delete pref;
622		break;
	619	break;
623	620
624	621	default:
…	…
688	685	return lResult;
689	686	#endif
690		break;
	687	break;
	688
	689	case WM_LBUTTONDOWN:
	690	{
	691	SHRGINFO shrg;
	692	shrg.cbSize = sizeof( shrg );
	693	shrg.hwndClient = hwnd;
	694	shrg.ptDown.x = LOWORD(lp);
	695	shrg.ptDown.y = HIWORD(lp);
	696	shrg.dwFlags = SHRG_RETURNCMD ;
	697
	698	if( SHRecognizeGesture( &shrg ) == GN_CONTEXTMENU )
	699	PopupMenu( p_intf, hwnd, shrg.ptDown );
	700	}
	701	break;
691	702
692	703	case WM_HELP:
693	704	MessageBox (hwnd, _T("Help"), _T("Help"), MB_OK);
694		break;
	705	break;
695	706
696	707	case WM_CLOSE:
697	708	DestroyWindow( hwndCB );
698	709	DestroyWindow( hwnd );
699		break;
	710	break;
700	711
701	712	case WM_DESTROY:
702	713	PostQuitMessage( 0 );
703		break;
	714	break;
704	715	}
705	716

modules/gui/wince/menus.cpp

r89031d0	r08947dc
55	55	};
56	56
	57	HMENU OpenStreamMenu( intf_thread_t *p_intf )
	58	{
	59	HMENU hmenu = CreatePopupMenu();
	60	AppendMenu( hmenu, MF_STRING, ID_FILE_QUICKOPEN,
	61	_T("Quick &Open File...") );
	62	AppendMenu( hmenu, MF_STRING, ID_FILE_OPENFILE,
	63	_T("Open &File...") );
	64	AppendMenu( hmenu, MF_STRING, ID_FILE_OPENNET,
	65	_T("Open &Network Stream...") );
	66	return hmenu;
	67	}
	68
	69	HMENU MiscMenu( intf_thread_t *p_intf )
	70	{
	71	HMENU hmenu = CreatePopupMenu();
	72	AppendMenu( hmenu, MF_STRING, ID_VIEW_STREAMINFO, _T("Media &Info...") );
	73	AppendMenu( hmenu, MF_STRING, ID_VIEW_MESSAGES, _T("&Messages...") );
	74	AppendMenu( hmenu, MF_STRING, ID_PREFERENCES, _T("&Preferences...") );
	75	return hmenu;
	76	}
	77
	78	void PopupMenu( intf_thread_t *p_intf, HWND p_parent, POINT point )
	79	{
	80	#define MAX_POPUP_ITEMS 45
	81
	82	vlc_object_t p_object, p_input;
	83	char *ppsz_varnames[MAX_POPUP_ITEMS];
	84	int pi_objects[MAX_POPUP_ITEMS];
	85	vector<MenuItemExt*>::iterator iter;
	86	int i = 0, i_last_separator = 0;
	87
	88	/* Initializations */
	89	memset( pi_objects, 0, MAX_POPUP_ITEMS * sizeof(int) );
	90
	91	/* Input menu */
	92	p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
	93	FIND_ANYWHERE );
	94	if( p_object != NULL )
	95	{
	96	ppsz_varnames[i] = "bookmark";
	97	pi_objects[i++] = p_object->i_object_id;
	98	ppsz_varnames[i] = "title";
	99	pi_objects[i++] = p_object->i_object_id;
	100	ppsz_varnames[i] = "chapter";
	101	pi_objects[i++] = p_object->i_object_id;
	102	ppsz_varnames[i] = "program";
	103	pi_objects[i++] = p_object->i_object_id;
	104	ppsz_varnames[i] = "navigation";
	105	pi_objects[i++] = p_object->i_object_id;
	106	ppsz_varnames[i] = "dvd_menus";
	107	pi_objects[i++] = p_object->i_object_id;
	108
	109	ppsz_varnames[i] = "video-es";
	110	pi_objects[i++] = p_object->i_object_id;
	111	ppsz_varnames[i] = "audio-es";
	112	pi_objects[i++] = p_object->i_object_id;
	113	ppsz_varnames[i] = "spu-es";
	114	pi_objects[i++] = p_object->i_object_id;
	115	}
	116	p_input = p_object;
	117	if( !p_input ) goto interfacemenu;
	118
	119	/* Video menu */
	120	if( i != i_last_separator ) ppsz_varnames[i++] = NULL; /* Separator */
	121	i_last_separator = i;
	122
	123	p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
	124	FIND_ANYWHERE );
	125	if( p_object != NULL )
	126	{
	127	vlc_object_t *p_dec_obj;
	128
	129	ppsz_varnames[i] = "fullscreen";
	130	pi_objects[i++] = p_object->i_object_id;
	131	ppsz_varnames[i] = "zoom";
	132	pi_objects[i++] = p_object->i_object_id;
	133	ppsz_varnames[i] = "deinterlace";
	134	pi_objects[i++] = p_object->i_object_id;
	135	ppsz_varnames[i] = "aspect-ratio";
	136	pi_objects[i++] = p_object->i_object_id;
	137	ppsz_varnames[i] = "crop";
	138	pi_objects[i++] = p_object->i_object_id;
	139	ppsz_varnames[i] = "video-on-top";
	140	pi_objects[i++] = p_object->i_object_id;
	141	ppsz_varnames[i] = "directx-wallpaper";
	142	pi_objects[i++] = p_object->i_object_id;
	143	ppsz_varnames[i] = "video-snapshot";
	144	pi_objects[i++] = p_object->i_object_id;
	145
	146	p_dec_obj = (vlc_object_t *)vlc_object_find( p_object,
	147	VLC_OBJECT_DECODER,
	148	FIND_PARENT );
	149	if( p_dec_obj != NULL )
	150	{
	151	ppsz_varnames[i] = "ffmpeg-pp-q";
	152	pi_objects[i++] = p_dec_obj->i_object_id;
	153	vlc_object_release( p_dec_obj );
	154	}
	155
	156	vlc_object_release( p_object );
	157	}
	158
	159	/* Audio menu */
	160	if( i != i_last_separator ) ppsz_varnames[i++] = NULL; /* Separator */
	161	i_last_separator = i;
	162
	163	p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_AOUT,
	164	FIND_ANYWHERE );
	165	if( p_object != NULL )
	166	{
	167	ppsz_varnames[i] = "audio-device";
	168	pi_objects[i++] = p_object->i_object_id;
	169	ppsz_varnames[i] = "audio-channels";
	170	pi_objects[i++] = p_object->i_object_id;
	171	ppsz_varnames[i] = "visual";
	172	pi_objects[i++] = p_object->i_object_id;
	173	ppsz_varnames[i] = "equalizer";
	174	pi_objects[i++] = p_object->i_object_id;
	175	vlc_object_release( p_object );
	176	}
	177
	178	interfacemenu:
	179	/* Interface menu */
	180	if( i != i_last_separator ) ppsz_varnames[i++] = NULL; /* Separator */
	181	i_last_separator = i;
	182
	183	/* vlc_object_find is needed because of the dialogs provider case */
	184	p_object = (vlc_object_t *)vlc_object_find( p_intf, VLC_OBJECT_INTF,
	185	FIND_PARENT );
	186	if( p_object != NULL )
	187	{
	188	/* Nothing for now */
	189	vlc_object_release( p_object );
	190	}
	191
	192	/* Build menu */
	193	vector<MenuItemExt*> popup_menu;
	194	HMENU hmenu = CreatePopupMenu();
	195	RefreshMenu( p_intf, &popup_menu, hmenu, i,
	196	ppsz_varnames, pi_objects, PopupMenu_Events );
	197
	198	/* Add static entries */
	199	if( p_input != NULL )
	200	{
	201	vlc_value_t val;
	202	AppendMenu( hmenu, MF_SEPARATOR, 0, _T("") );
	203	AppendMenu( hmenu, MF_STRING, StopStream_Event, _T("Stop") );
	204	AppendMenu( hmenu, MF_STRING, PrevStream_Event, _T("Previous") );
	205	AppendMenu( hmenu, MF_STRING, NextStream_Event, _T("Next") );
	206
	207	var_Get( p_input, "state", &val );
	208	if( val.i_int == PAUSE_S )
	209	AppendMenu( hmenu, MF_STRING, PlayStream_Event, _T("Play") );
	210	else
	211	AppendMenu( hmenu, MF_STRING, PlayStream_Event, _T("Pause") );
	212
	213	vlc_object_release( p_input );
	214	}
	215	else
	216	{
	217	playlist_t * p_playlist =
	218	(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
	219	FIND_ANYWHERE );
	220	if( p_playlist && p_playlist->i_size )
	221	{
	222	AppendMenu( hmenu, MF_SEPARATOR, 0, _T("") );
	223	AppendMenu( hmenu, MF_STRING, PlayStream_Event, _T("Play") );
	224	}
	225	if( p_playlist ) vlc_object_release( p_playlist );
	226	}
	227
	228	AppendMenu( hmenu, MF_POPUP\|MF_STRING, (UINT)MiscMenu( p_intf ),
	229	_T("Miscellaneous") );
	230	AppendMenu( hmenu, MF_POPUP\|MF_STRING, (UINT)OpenStreamMenu( p_intf ),
	231	_T("Open") );
	232
	233	TrackPopupMenu( hmenu, 0, point.x, point.y, 0, p_parent, 0 );
	234	PostMessage( p_parent, WM_NULL, 0, 0 );
	235	DestroyMenu( hmenu );
	236	}
	237
57	238	void RefreshAudioMenu( intf_thread_t *p_intf, HMENU hMenu )
58	239	{
…	…
273	454	i = 0;
274	455
275		AppendMenu( hMenu, MF_STRING, ID_SETTINGS_EXTEND, _T("&Extended GUI") );
276		AppendMenu( hMenu, MF_STRING, ID_SETTINGS_PREF, _T("&Preferences...") );
	456	AppendMenu( hMenu, MF_STRING, ID_PREFERENCES, _T("&Preferences...") );
277	457
278	458	p_object = (vlc_object_t *)

modules/gui/wince/timer.cpp

rede8b84	r08947dc
39	39	/* Callback prototype */
40	40	static int PopupMenuCB( vlc_object_t p_this, const char psz_variable,
41		vlc_value_t old_val, vlc_value_t new_val, void *~~param~~ );
	41	vlc_value_t old_val, vlc_value_t new_val, void * );
42	42
43	43	/*****************************************************************************
44	44	* Constructor.
45	45	*****************************************************************************/
46		Timer::Timer( intf_thread_t _p_intf, HWND hwnd, Interface _p_main_interface)~~//, Interface *_p_main_interface )~~
	46	Timer::Timer( intf_thread_t _p_intf, HWND hwnd, Interface _p_main_interface)
47	47	{
48	48	p_intf = _p_intf;
…	…
242	242	{
243	243	intf_thread_t p_intf = (intf_thread_t )param;
244
245		/* Nothing for now */
	244	POINT point = {0};
	245
	246	PopupMenu( p_intf, p_intf->p_sys->p_main_window->hWnd, point );
246	247
247	248	return VLC_SUCCESS;

modules/gui/wince/wince.cpp

r953d89a	r08947dc
160	160	MSG msg;
161	161	Interface *pInterface = new Interface();
	162	p_intf->p_sys->p_main_window = pInterface;
162	163
163	164	if( !hInstance ) hInstance = GetModuleHandle(NULL);

modules/gui/wince/wince.h

r953d89a	r08947dc
47	47	using namespace std;
48	48
	49	class CBaseWindow;
49	50	class MenuItemExt;
50	51	class VideoWindow;
…	…
75	76	void (pf_show_dialog) ( intf_thread_t p_intf, int i_dialog, int i_arg,
76	77	intf_dialog_args_t *p_arg );
	78
	79	CBaseWindow *p_main_window;
77	80
78	81	/* Dynamic Menu management */
…	…
125	128
126	129	CBaseWindow CreateVideoWindow( intf_thread_t , HWND );
	130	void PopupMenu( intf_thread_t *, HWND, POINT );
127	131
128	132	/* Main Interface */
…	…
539	543	#define SHFS_SHOWSIPBUTTON 0x0004
540	544	#define GN_CONTEXTMENU 1000
	545	#define SHRG_RETURNCMD 0x0001
	546	#define SHRG_NOTIFYPARENT 0x0002
541	547	#define SHCMBM_GETSUBMENU (WM_USER + 401)
542	548	#define SHCMBM_GETMENU (WM_USER + 402)
…	…
584	590
585	591	BOOL WINAPI CommandBar_InsertMenubarEx(HWND, HINSTANCE, LPTSTR, WORD);
	592
	593	typedef struct tagSHRGI
	594	{
	595	DWORD cbSize;
	596	HWND hwndClient;
	597	POINT ptDown;
	598	DWORD dwFlags;
	599	} SHRGINFO, *PSHRGINFO;
	600
	601	DWORD SHRecognizeGesture(SHRGINFO *shrg);
586	602	}
587	603
…	…
590	606	# define SHInitDialog(a)
591	607	# define SHCreateMenuBar(a) 1
	608	# define SHRecognizeGesture(a) 0
592	609	#endif
593	610
…	…
599	616	#define IDB_BITMAP2 111
600	617	#define IDR_MENUBAR1 113
601		~~#define IDR_ACCELERATOR1 116~~
602	618	#define IDD_FILEINFO 118
603	619	#define IDD_DUMMY 118
…	…
608	624	#define IDB_BITMAP3 123
609	625	#define IDD_ITEMINFO 124
610		~~#define IDR_DUMMYMENU 126~~
611	626	#define IDCLEAR 1001
612	627	#define IDSAVEAS 1002
613		~~#define IDC_TEXTCTRL 1004~~
614		~~#define IDC_CUSTOM1 1012~~
615		~~#define IDS_MAIN_MENUITEM1 40001~~
616		~~#define IDS_TITLE 40002~~
617		~~#define IDS_CLASSNAME 40003~~
618		~~#define IDS_CAP_QUICKFILEOPEN 40006~~
619		~~#define IDS_CAP_VIEW 40009~~
620		~~#define IDS_CAP_SETTINGS 40012~~
621		~~#define IDS_CAP_AUDIO 40015~~
622		~~#define IDS_CAP_VIDEO 40018~~
623		~~#define IDS_CAP_HELP 40021~~
624		~~#define IDS_CAP_Navigation 40024~~
625		~~#define IDS_CAP_FILE 40025~~
626		~~#define ID_COLOR_OPTIONS 40026~~
627		~~#define IDS_DYNAMENU 40027~~
628	628	#define ID_FILE 40028
629		~~#define IDS_BLACK 40028~~
630		~~#define IDS_LTGRAY 40029~~
631	629	#define ID_VIEW 40030
632		~~#define IDS_DKGRAY 40030~~
633		~~#define IDS_WHITE 40031~~
634	630	#define ID_SETTINGS 40032
635	631	#define ID_AUDIO 40034
…	…
643	639	#define IDM_VIDEO 40050
644	640	#define IDM_NAVIGATION 40053
645		#define ID_FILE_QUICK_OPEN 40056
646		#define ID_FILE_OPENFILE 40057
647		#define ID_FILE_QUICKOPEN 40058
648		#define ID_FILE_OPENNETWORKSTREAM 40059
649		#define ID_FILE_OPENNET 40060
	641	#define ID_FILE_QUICKOPEN 40057
	642	#define ID_FILE_OPENFILE 40058
	643	#define ID_FILE_OPENNET 40059
650	644	#define ID_FILE_EXIT 40061
651	645	#define ID_VIEW_PLAYLIST 40063
…	…
653	647	#define ID_VIEW_MEDIAINFO 40065
654	648	#define ID_VIEW_STREAMINFO 40066
655		#define ID~~S_CAP_NAV 40067~~
	649	#define ID_PREFERENCES 40071
656	650	#define ID_FILE_ABOUT 40069
657		~~#define ID_SETTINGS_PREF 40071~~
658		~~#define ID_SETTINGS_EXTEND 40072~~
659		~~#define IDS_CAP_XXX 40084~~
660	651	#define IDM_MANAGE 40087
661	652	#define IDM_SORT 40088
…	…
676	667	#define ID_MANAGE_OPENPL 40107
677	668	#define ID_MANAGE_SAVEPL 40108
678		~~#define ID_MENUITEM40108 40109~~
679		~~#define IDS_CAP_MENUITEM40109 40110~~
680		~~#define IDS_STOP 57601~~
681	669	#define StopStream_Event 57601
682		~~#define IDS_PLAY 57602~~
683	670	#define PlayStream_Event 57602
684	671	#define PrevStream_Event 57603
…	…
686	673	#define SlowStream_Event 57605
687	674	#define FastStream_Event 57606
688
689		~~// Next default values for new objects~~
690		//
691		~~#ifdef APSTUDIO_INVOKED~~
692		~~#ifndef APSTUDIO_READONLY_SYMBOLS~~
693		~~#define _APS_NEXT_RESOURCE_VALUE 128~~
694		~~#define _APS_NEXT_COMMAND_VALUE 40111~~
695		~~#define _APS_NEXT_CONTROL_VALUE 1013~~
696		~~#define _APS_NEXT_SYMED_VALUE 101~~
697		~~#endif~~
698		~~#endif~~

Download in other formats: