[hbelusca] 66746: [MPLAY32]: - Improve the app's title by printing the filename and the current state of the player. By Ricardo Hanke. - Fix pause state retrieval.
16 Mar
2015
16 Mar
'15
9:16 p.m.
Author: hbelusca
Date: Mon Mar 16 21:16:07 2015
New Revision: 66746
URL: http://svn.reactos.org/svn/reactos?rev=66746&view=rev
Log:
[MPLAY32]:
- Improve the app's title by printing the filename and the current state of the
player. By Ricardo Hanke.
- Fix pause state retrieval.
Modified:
trunk/reactos/base/applications/mplay32/lang/bg-BG.rc
trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc
trunk/reactos/base/applications/mplay32/lang/de-DE.rc
trunk/reactos/base/applications/mplay32/lang/en-US.rc
trunk/reactos/base/applications/mplay32/lang/es-ES.rc
trunk/reactos/base/applications/mplay32/lang/fr-FR.rc
trunk/reactos/base/applications/mplay32/lang/he-IL.rc
trunk/reactos/base/applications/mplay32/lang/it-IT.rc
trunk/reactos/base/applications/mplay32/lang/ja-JP.rc
trunk/reactos/base/applications/mplay32/lang/nl-NL.rc
trunk/reactos/base/applications/mplay32/lang/no-NO.rc
trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
trunk/reactos/base/applications/mplay32/lang/pt-BR.rc
trunk/reactos/base/applications/mplay32/lang/ro-RO.rc
trunk/reactos/base/applications/mplay32/lang/ru-RU.rc
trunk/reactos/base/applications/mplay32/lang/sk-SK.rc
trunk/reactos/base/applications/mplay32/lang/sq-AL.rc
trunk/reactos/base/applications/mplay32/lang/sv-SE.rc
trunk/reactos/base/applications/mplay32/lang/tr-TR.rc
trunk/reactos/base/applications/mplay32/lang/uk-UA.rc
trunk/reactos/base/applications/mplay32/lang/zh-CN.rc
trunk/reactos/base/applications/mplay32/lang/zh-TW.rc
trunk/reactos/base/applications/mplay32/mplay32.c
trunk/reactos/base/applications/mplay32/resource.h
Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -47,6 +47,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "ÐÑиÑки поддÑÑжани"
IDS_TOOLTIP_PLAY "ÐÑÑкане"
IDS_TOOLTIP_STOP "СпиÑане"
Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -48,6 +48,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Všechny podporované"
IDS_TOOLTIP_PLAY "PÅehrát"
IDS_TOOLTIP_STOP "Zastavit"
Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unbekannt"
+ IDS_MODE_OPEN "Geöffnet"
+ IDS_MODE_STOP "Angehalten"
+ IDS_MODE_PLAY "Wiedergabe"
+ IDS_MODE_PAUSE "Pause"
+ IDS_MODE_RECORD "Aufnehmen"
+ IDS_MODE_SEEK "Spulen"
+ IDS_MODE_NOT_READY "Nicht bereit"
IDS_ALL_TYPES_FILTER "Alle unterstützten"
IDS_TOOLTIP_PLAY "Wiedergabe"
IDS_TOOLTIP_STOP "Stopp"
Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "All Supported"
IDS_TOOLTIP_PLAY "Play"
IDS_TOOLTIP_STOP "Stop"
Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Todos los archivos soportados"
IDS_TOOLTIP_PLAY "Reproducir"
IDS_TOOLTIP_STOP "Detener"
Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Inconnu"
+ IDS_MODE_OPEN "Ouvert"
+ IDS_MODE_STOP "Arrêté"
+ IDS_MODE_PLAY "Lecture"
+ IDS_MODE_PAUSE "En pause"
+ IDS_MODE_RECORD "Enregistrement"
+ IDS_MODE_SEEK "Recherche"
+ IDS_MODE_NOT_READY "Pas prêt"
IDS_ALL_TYPES_FILTER "Tous les types supportés"
IDS_TOOLTIP_PLAY "Lecture"
IDS_TOOLTIP_STOP "Stop"
Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "×× ×ק×צ×× ×× ×ª××××"
IDS_TOOLTIP_PLAY "× ××"
IDS_TOOLTIP_STOP "עצ×ר"
Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Tutti i tipi supportati"
IDS_TOOLTIP_PLAY "Riproduci"
IDS_TOOLTIP_STOP "Interrompi"
Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "ãã¹ã¦ã®ãµãã¼ãããããã¡ã¤ã«"
IDS_TOOLTIP_PLAY "åç"
IDS_TOOLTIP_STOP "åæ¢"
Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Mediabestanden"
IDS_TOOLTIP_PLAY "Afspelen"
IDS_TOOLTIP_STOP "Stoppen"
Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Alle kompaktible filer"
IDS_TOOLTIP_PLAY "Spill av"
IDS_TOOLTIP_STOP "Stopp"
Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -51,6 +51,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Wszystkie formaty"
IDS_TOOLTIP_PLAY "Odtwarzaj"
IDS_TOOLTIP_STOP "Zatrzymaj"
Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -45,6 +45,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Todos os formatos"
IDS_TOOLTIP_PLAY "Executar"
IDS_TOOLTIP_STOP "Pausar"
Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -49,6 +49,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Toate admisibile"
IDS_TOOLTIP_PLAY "Redare conÈinut multimedia"
IDS_TOOLTIP_STOP "Oprirea lecturii"
Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -43,6 +43,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "ÐÑе поддеÑживаемÑе"
IDS_TOOLTIP_PLAY "ÐоÑпÑоизведение"
IDS_TOOLTIP_STOP "ÐÑÑановиÑÑ"
Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -48,6 +48,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Všetky podporované"
IDS_TOOLTIP_PLAY "Prehrať"
IDS_TOOLTIP_STOP "Zastaviť"
Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -47,6 +47,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Të gjith suportimet"
IDS_TOOLTIP_PLAY "Fillo"
IDS_TOOLTIP_STOP "Ndalo"
Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -50,6 +50,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Alla kompaktibla filer"
IDS_TOOLTIP_PLAY "Spela upp"
IDS_TOOLTIP_STOP "Stopp"
Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -45,6 +45,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "Desteklenen Kütükler"
IDS_TOOLTIP_PLAY "Ãal"
IDS_TOOLTIP_STOP "Durdur"
Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -51,6 +51,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "ÐÑÑ Ð¿ÑдÑÑимÑванÑ"
IDS_TOOLTIP_PLAY "ÐÑдÑвоÑеннÑ"
IDS_TOOLTIP_STOP "ÐÑпиниÑи"
Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -45,6 +45,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "æææ¯æçæ ¼å¼"
IDS_TOOLTIP_PLAY "ææ¾"
IDS_TOOLTIP_STOP "åæ¢"
Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -51,6 +51,14 @@
STRINGTABLE
BEGIN
+ IDS_MODE_UNKNOWN "Unknown"
+ IDS_MODE_OPEN "Opened"
+ IDS_MODE_STOP "Stopped"
+ IDS_MODE_PLAY "Playing"
+ IDS_MODE_PAUSE "Paused"
+ IDS_MODE_RECORD "Recording"
+ IDS_MODE_SEEK "Seeking"
+ IDS_MODE_NOT_READY "Not ready"
IDS_ALL_TYPES_FILTER "æææ¯æ´æ ¼å¼"
IDS_TOOLTIP_PLAY "ææ¾"
IDS_TOOLTIP_STOP "åæ¢"
Modified: trunk/reactos/base/applications/mplay32/mplay32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -19,13 +19,16 @@
TCHAR szAppTitle[256] = _T("");
TCHAR szDefaultFilter[MAX_PATH] = _T("");
-TCHAR *szFilter = NULL;
+TCHAR szCurrentFile[MAX_PATH] = _T("");
+LPTSTR szFilter = NULL;
WORD wDeviceId = 0;
BOOL bRepeat = FALSE;
BOOL bIsSingleWindow = FALSE;
UINT MaxFilePos = 0;
RECT PrevWindowPos;
+
+static DWORD GetDeviceMode(HWND hwnd);
/* ToolBar Buttons */
static const TBBUTTON Buttons[] =
@@ -87,6 +90,71 @@
ptDifference.x = (rcWindowRect.right - rcWindowRect.left) - rcClientRect.right;
ptDifference.y = (rcWindowRect.bottom - rcWindowRect.top) - rcClientRect.bottom;
MoveWindow(hwnd, rcWindowRect.left, rcWindowRect.top, nWidth + ptDifference.x,
nHeight + ptDifference.y, TRUE);
+}
+
+void UpdateWindowCaption(HWND hwnd)
+{
+ TCHAR szNewTitle[MAX_PATH + 3 + 256];
+ TCHAR szStatus[128];
+
+ if (wDeviceId == 0)
+ {
+ SetWindowText(hwnd, szAppTitle);
+ return;
+ }
+
+ switch (GetDeviceMode(hwnd))
+ {
+ case MCI_MODE_PAUSE:
+ {
+ LoadString(hInstance, IDS_MODE_PAUSE, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_STOP:
+ {
+ LoadString(hInstance, IDS_MODE_STOP, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_PLAY:
+ {
+ LoadString(hInstance, IDS_MODE_PLAY, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_OPEN:
+ {
+ LoadString(hInstance, IDS_MODE_OPEN, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_RECORD:
+ {
+ LoadString(hInstance, IDS_MODE_RECORD, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_SEEK:
+ {
+ LoadString(hInstance, IDS_MODE_SEEK, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ case MCI_MODE_NOT_READY:
+ {
+ LoadString(hInstance, IDS_MODE_NOT_READY, szStatus, ARRAYSIZE(szStatus));
+ break;
+ }
+
+ default:
+ {
+ LoadString(hInstance, IDS_MODE_UNKNOWN, szStatus, ARRAYSIZE(szStatus));
+ }
+ }
+
+ StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s (%s)"),
szAppTitle, szCurrentFile, szStatus);
+ SetWindowText(hwnd, szNewTitle);
}
static VOID
@@ -375,7 +443,7 @@
MCI_STATUS_PARMS mciStatus;
MCI_OPEN_PARMS mciOpen;
DWORD dwFlags = MCI_OPEN_ELEMENT | MCI_WAIT;
- TCHAR szNewTitle[MAX_PATH + 3 + 256];
+ LPTSTR lpStr;
if (wDeviceId)
CloseMciDevice();
@@ -422,13 +490,22 @@
SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100000, (LPARAM)0);
}
- StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle,
lpFileName);
- SetWindowText(hwnd, szNewTitle);
-
MaxFilePos = mciStatus.dwReturn;
wDeviceId = mciOpen.wDeviceID;
+ /* NOTE: Everything above this line may be done instead in OpenMediaFile() */
+
+ lpStr = _tcsrchr(lpFileName, _T('\\'));
+ if (lpStr) // Get only the file name (skip the last path separator)
+ lpStr++;
+ else
+ lpStr = lpFileName;
+
+ StringCbCopy(szCurrentFile, sizeof(szCurrentFile), lpStr);
+
EnableMenuItems(hwnd);
+
+ UpdateWindowCaption(hwnd);
return 0;
}
@@ -470,6 +547,8 @@
}
mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
+
+ UpdateWindowCaption(hwnd);
SendMessage(hToolBar,
TB_SETCMDID,
@@ -604,6 +683,8 @@
return;
}
+ UpdateWindowCaption(hwnd);
+
SendMessage(hToolBar,
TB_SETCMDID,
0,
@@ -636,7 +717,7 @@
case MCI_MODE_PLAY:
{
mciGeneric.dwCallback = (DWORD_PTR)hwnd;
- mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY,
(DWORD_PTR)&mciGeneric);
+ mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY | MCI_WAIT,
(DWORD_PTR)&mciGeneric);
idBmp = IDB_PLAYICON;
idCmd = IDC_PLAY;
break;
@@ -662,6 +743,8 @@
ShowMCIError(hwnd, mciError);
return;
}
+
+ UpdateWindowCaption(hwnd);
SendMessage(hToolBar,
TB_SETCMDID,
@@ -695,7 +778,7 @@
SwitchViewMode(hwnd);
CloseMciDevice();
- SetWindowText(hwnd, szAppTitle);
+ UpdateWindowCaption(hwnd);
}
static VOID
@@ -1027,8 +1110,6 @@
case WM_SIZE:
{
RECT Rect;
- RECT ToolbarRect;
- MCI_DGV_PUT_PARMS mciPut;
if (hToolBar && hTrackBar)
{
@@ -1037,13 +1118,14 @@
if (!bIsSingleWindow)
{
- UINT Size;
-
- Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
+ UINT Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom;
MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size,
TRUE);
}
else
{
+ RECT ToolbarRect;
+ MCI_DGV_PUT_PARMS mciPut;
+
MoveWindow(hTrackBar, 180, 0, LOWORD(lParam) - 180, 25, TRUE);
GetClientRect(hwnd, &Rect);
@@ -1094,13 +1176,10 @@
case IDC_PAUSE:
{
if (wDeviceId)
- {
TogglePlaybackState(hwnd);
- }
else
- {
OpenFileDialog(hwnd);
- }
+
break;
}
Modified: trunk/reactos/base/applications/mplay32/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Mon Mar 16 21:16:07
2015
@@ -27,8 +27,17 @@
#define IDS_PLAY 110
#define IDS_DEFAULTMCIERRMSG 111
+#define IDS_MODE_UNKNOWN 120
+#define IDS_MODE_OPEN 121
+#define IDS_MODE_STOP 122
+#define IDS_MODE_PLAY 123
+#define IDS_MODE_PAUSE 124
+#define IDS_MODE_RECORD 125
+#define IDS_MODE_SEEK 126
+#define IDS_MODE_NOT_READY 127
+
/* Menu */
-#define IDR_MAINMENU 500
+#define IDR_MAINMENU 500
/* Accelerators */
#define ID_ACCELERATORS 800
3476
days inactive
3476
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org