summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 21:06:03 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 21:06:03 +0000
commitbfe979e1cc07e94096dd4a63f013c907d1d986a6 (patch)
tree042f6f71105c3266d270956f7bc370e5aea67b57 /media
parent10f27fb06b2d231f8ab3bb0177439760d9a3b654 (diff)
downloadchromium_src-bfe979e1cc07e94096dd4a63f013c907d1d986a6.zip
chromium_src-bfe979e1cc07e94096dd4a63f013c907d1d986a6.tar.gz
chromium_src-bfe979e1cc07e94096dd4a63f013c907d1d986a6.tar.bz2
Added media player File->Last to play the most recent movie again.
Review URL: http://codereview.chromium.org/100149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/player/list.h1
-rw-r--r--media/player/player_wtl.rc18
-rw-r--r--media/player/resource.h11
-rw-r--r--media/player/stdafx.h2
4 files changed, 17 insertions, 15 deletions
diff --git a/media/player/list.h b/media/player/list.h
index 87995f5..ddf8f86 100644
--- a/media/player/list.h
+++ b/media/player/list.h
@@ -3,6 +3,7 @@
// LICENSE file.
// list.h : class for Recent Files list
+// TODO(fbarchard): Remove hungarian notations.
#ifndef MEDIA_PLAYER_LIST_H_
#define MEDIA_PLAYER_LIST_H_
diff --git a/media/player/player_wtl.rc b/media/player/player_wtl.rc
index 69ce708..5f9eaa8 100644
--- a/media/player/player_wtl.rc
+++ b/media/player/player_wtl.rc
@@ -1,7 +1,5 @@
// Microsoft Visual C++ generated resource script.
//
-// This file is in Microsoft coding style
-
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
@@ -91,7 +89,6 @@ BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
- MENUITEM "&Last...\tLast+L", ID_FILE_LAST
MENUITEM SEPARATOR
MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT
MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW
@@ -101,6 +98,7 @@ BEGIN
BEGIN
MENUITEM "(empty)", ID_FILE_MRU_FILE1
END
+ MENUITEM "&Last...\tLast+L", ID_FILE_LAST
MENUITEM SEPARATOR
MENUITEM "E&xit", ID_APP_EXIT
END
@@ -361,7 +359,6 @@ STRINGTABLE
BEGIN
ID_FILE_NEW "Create a new document\nNew"
ID_FILE_OPEN "Open a movie\nOpen"
- ID_FILE_LAST "Replay last movie\nOpen"
ID_FILE_CLOSE "Close movie\nClose"
ID_FILE_SAVE "Save the movie\nSave"
ID_FILE_SAVE_AS "Save the movie with a new name\nSave As"
@@ -373,6 +370,15 @@ END
STRINGTABLE
BEGIN
+ ID_VIEW_FULLSCREEN "Full screen mode."
+ ID_PLAY_HALFSPEED "Play movie at half normal speed."
+ ID_PLAY_NORMALSPEED "Play movie at normal speed."
+ ID_PLAY_DOUBLESPEED "Play movie at twice the normal speed."
+ ID_FILE_LAST "Replay last movie\nOpen"
+END
+
+STRINGTABLE
+BEGIN
ID_APP_ABOUT "Display program information, version number and copyright\nAbout"
ID_APP_EXIT "Quit the application; prompts to save documents\nExit"
END
@@ -461,10 +467,6 @@ BEGIN
ID_VIEW_NORMALSIZE "View movie at normal size."
ID_VIEW_DOUBLESIZE "View movie at twice the normal size."
ID_VIEW_FITTOSCREEN "Maximize window to desktop."
- ID_VIEW_FULLSCREEN "Full screen mode."
- ID_PLAY_HALFSPEED "Play movie at half normal speed."
- ID_PLAY_NORMALSPEED "Play movie at normal speed."
- ID_PLAY_DOUBLESPEED "Play movie at twice the normal speed."
END
#endif // English (U.S.) resources
diff --git a/media/player/resource.h b/media/player/resource.h
index b71887f..4a8ef30 100644
--- a/media/player/resource.h
+++ b/media/player/resource.h
@@ -1,8 +1,7 @@
-// {{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by player_wtl.rc
-// This file is in Microsoft coding style.
-
+//
#define IDD_ABOUTBOX 100
#define IDR_MAINFRAME 128
#define IDR_MAINFRAME2 128
@@ -24,7 +23,6 @@
#define IDC_FILEDATE 1011
#define IDC_FILEATTRIB 1012
#define ID_RECENT_BTN 32777
-#define ID_FILE_LAST 32804
#define ID_VIEW_PROPERTIES 32778
#define ID_VIEW_MEDIADETAILS 32780
#define ID_PLAY_PLAY 32781
@@ -35,8 +33,8 @@
#define ID_OPTIONS_DRAW 32792
#define ID_OPTIONS_AUDIO 32793
#define ID_OPTIONS_DUMPYUVFILE 32794
-#define ID_Menu 32796
#define ID_VIEW_HALFSIZE 32795
+#define ID_Menu 32796
#define ID_VIEW_NORMALSIZE 32797
#define ID_VIEW_DOUBLESIZE 32798
#define ID_VIEW_FITTOSCREEN 32799
@@ -44,8 +42,10 @@
#define ID_PLAY_HALFSPEED 32801
#define ID_PLAY_NORMALSPEED 32802
#define ID_PLAY_DOUBLESPEED 32803
+#define ID_FILE_LAST 32804
// Next default values for new objects
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 203
@@ -54,4 +54,3 @@
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
diff --git a/media/player/stdafx.h b/media/player/stdafx.h
index bd55969..a82c783 100644
--- a/media/player/stdafx.h
+++ b/media/player/stdafx.h
@@ -21,7 +21,7 @@
#include <atlbase.h>
#include <atlapp.h>
-extern CAppModule _Module;
+extern CAppModule g_module;
#include <atlwin.h>