sync with upstream

2 files changed, 18 insertions, 39 deletions

diff --git a/xbmc/input/ActionIDs.h b/xbmc/input/ActionIDs.h
index 5db1ffc..12a5334 100644
--- a/xbmc/input/ActionIDs.h
+++ b/xbmc/input/ActionIDs.h
@@ -1,22 +1,11 @@
 /*
- *      Copyright (C) 2005-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
  */
+
 #pragma once
 
 /**
@@ -104,6 +93,7 @@
 
 #define ACTION_PLAYER_PROCESS_INFO    69 //!< show player process info (video decoder, pixel format, pvr signal strength and the like
 #define ACTION_PLAYER_PROGRAM_SELECT  70
+#define ACTION_PLAYER_RESOLUTION_SELECT  71
 #define ACTION_SMALL_STEP_BACK        76  //!< jumps a few seconds back during playback of movie. Can b used in videoFullScreen.xml window id=2005
 
 #define ACTION_PLAYER_FORWARD         77  //!< FF in current file played. global action, can be used anywhere
@@ -277,6 +267,8 @@
 
 #define ACTION_TOGGLE_FONT            249 //!< Toggle font. Used in TextViewer dialog
 
+#define ACTION_VIDEO_NEXT_STREAM      250 //!< Cycle video streams. Used in videofullscreen.
+
 // Voice actions
 #define ACTION_VOICE_RECOGNIZE        300
 
diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h
index 4e3787c..496f336 100644
--- a/xbmc/input/XBMC_vkeys.h
+++ b/xbmc/input/XBMC_vkeys.h
@@ -1,27 +1,15 @@
 /*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+ *  SDL - Simple DirectMedia Layer
+ *  Copyright (C) 1997-2009 Sam Lantinga
+ *
+ *  SPDX-License-Identifier: LGPL-2.1-or-later
+ *  See LICENSES/README.md for more information.
+ *
+ *  Sam Lantinga
+ *  slouken@libsdl.org
+ */
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with XBMC; see the file COPYING.  If not, see
-    <http://www.gnu.org/licenses/>.
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef XBMC_vkeys_h
-#define XBMC_vkeys_h
+#pragma once
 
 // The XBMC_vkey identifies a key that is mapped to an action or function.
 // The keysym.sym generated by SDL_KEYDOWN is mapped to a vkey and the vkey
@@ -283,4 +271,3 @@ typedef enum {
 #define VK_OEM_102      0xE2
 #endif
 
-#endif // XBMC_vkeys_h