core: rename vlc_keys.h to vlc_actions.h

Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>

include/vlc_keys.h → include/vlc_actions.h

@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_keys.h: keycode defines
+ * vlc_actions.h: handle vlc actions
  *****************************************************************************
- * Copyright (C) 2003-2009 VLC authors and VideoLAN
+ * Copyright (C) 2003-2016 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -21,8 +21,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_KEYS_H
-#define VLC_KEYS_H 1
+#ifndef VLC_ACTIONS_H
+#define VLC_ACTIONS_H 1
 
 /**
  * \file

include/vlc_vout_display.h

@@ -28,7 +28,7 @@
 #include <vlc_picture.h>
 #include <vlc_picture_pool.h>
 #include <vlc_subpicture.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_mouse.h>
 #include <vlc_vout.h>
 #include <vlc_vout_window.h>

lib/media_player.c

@@ -35,7 +35,7 @@
 #include <vlc_input.h>
 #include <vlc_vout.h>
 #include <vlc_aout.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #include "libvlc_internal.h"
 #include "media_internal.h" // libvlc_media_set_state()

modules/audio_filter/channel_mixer/spatialaudio.cpp

@@ -35,7 +35,6 @@
 #include <vlc_aout.h>
 #include <vlc_filter.h>
 #include <vlc_viewpoint.h>
-#include <vlc_keys.h>
 
 #include <new>
 #include <vector>

modules/control/globalhotkeys/win32.c

@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 /*****************************************************************************
  * Local prototypes

modules/control/globalhotkeys/xcb.c

@@ -27,7 +27,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <errno.h>
 
 #include <xcb/xcb.h>

modules/control/hotkeys.c

@@ -39,7 +39,7 @@
 #include <vlc_viewpoint.h>
 #include <vlc_vout_osd.h>
 #include <vlc_playlist.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include "math.h"
 
 #include <assert.h>

modules/control/lirc.c

@@ -36,7 +36,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #ifdef HAVE_POLL
 # include <poll.h>

modules/control/oldrc.c

@@ -43,7 +43,7 @@
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #include <sys/types.h>
 #include <unistd.h>

modules/demux/mkv/demux.cpp

@@ -27,7 +27,7 @@
 #include "stream_io_callback.hpp"
 #include "Ebml_parser.hpp"
 
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 event_thread_t::event_thread_t(demux_t *p_demux) : p_demux(p_demux)
 {

modules/gui/macosx/VLCCoreInteraction.m

@@ -28,7 +28,7 @@
 #import <math.h>
 #import <vlc_playlist.h>
 #import <vlc_input.h>
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 #import <vlc_vout.h>
 #import <vlc_vout_osd.h>
 #import <vlc/vlc.h>

modules/gui/macosx/VLCMain.m

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <vlc_common.h>
 #include <vlc_atomic.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_dialog.h>
 #include <vlc_url.h>
 #include <vlc_variables.h>

modules/gui/macosx/VLCPlaylist.m

@@ -48,7 +48,7 @@
 #import "VLCResumeDialogController.h"
 #import "VLCOpenWindowController.h"
 
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #import <vlc_interface.h>
 #include <vlc_url.h>
 

modules/gui/macosx/VLCSimplePrefsController.m

@@ -27,7 +27,7 @@
 #import "CompatibilityFixes.h"
 #import "VLCSimplePrefsController.h"
 #import "prefs.h"
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 #import <vlc_interface.h>
 #import <vlc_dialog.h>
 #import <vlc_modules.h>

modules/gui/macosx/VLCStringUtility.m

@@ -43,7 +43,7 @@ NSString *const kVLCMediaVideoTSFolder = @"VIDEO_TS";
 NSString *const kVLCMediaBDMVFolder = @"BDMV";
 NSString *const kVLCMediaUnknown = @"Unknown";
 
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 #import <vlc_strings.h>
 
 @implementation VLCStringUtility

modules/gui/macosx/VLCVoutView.m

@@ -39,7 +39,7 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 
 
 /*****************************************************************************

modules/gui/macosx/misc.m

@@ -29,7 +29,7 @@
 #import "VLCMainMenu.h"
 #import "VLCControlsBarCommon.h"
 #import "VLCCoreInteraction.h"
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 
 /*****************************************************************************
  * VLCDragDropView

modules/gui/macosx/prefs.m

@@ -59,7 +59,7 @@
 #import "VLCSimplePrefsController.h"
 #import "prefs_widgets.h"
 #import "VLCCoreInteraction.h"
-#import <vlc_keys.h>
+#import <vlc_actions.h>
 #import <vlc_modules.h>
 #import <vlc_plugin.h>
 

modules/gui/macosx/prefs_widgets.m

@@ -35,7 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #include "VLCMain.h"
 #include "prefs_widgets.h"

modules/gui/qt/actions_manager.cpp

@@ -26,7 +26,7 @@
 #endif
 
 #include <vlc_vout.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_renderer_discovery.h>
 
 #include "actions_manager.hpp"

modules/gui/qt/components/preferences_widgets.cpp

@@ -35,7 +35,7 @@
 #include "util/customwidgets.hpp"
 #include "util/searchlineedit.hpp"
 #include "util/qt_dirs.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>

modules/gui/qt/input_manager.cpp

@@ -30,7 +30,7 @@
 #include "input_manager.hpp"
 #include "recents.hpp"
 
-#include <vlc_keys.h>           /* ACTION_ID */
+#include <vlc_actions.h>           /* ACTION_ID */
 #include <vlc_url.h>            /* vlc_uri_decode */
 #include <vlc_strings.h>        /* vlc_strfinput */
 #include <vlc_aout.h>           /* audio_output_t */

modules/gui/qt/main_interface.cpp

@@ -64,7 +64,7 @@
 
 #include <QTimer>
 
-#include <vlc_keys.h>                       /* Wheel event */
+#include <vlc_actions.h>                    /* Wheel event */
 #include <vlc_vout_display.h>               /* vout_thread_t and VOUT_ events */
 
 // #define DEBUG_INTF

modules/gui/qt/util/customwidgets.cpp

@@ -37,7 +37,7 @@
 #include <QWheelEvent>
 #include <QPixmap>
 #include <QApplication>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 QFramelessButton::QFramelessButton( QWidget *parent )
                     : QPushButton( parent )

modules/gui/skins2/controls/ctrl_list.cpp

@@ -34,7 +34,7 @@
 #include "../events/evt_key.hpp"
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_scroll.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #define SCROLL_STEP 0.05f
 #define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines

modules/gui/skins2/controls/ctrl_tree.cpp

@@ -39,7 +39,7 @@
 #include "../events/evt_scroll.hpp"
 #include "../events/evt_dragndrop.hpp"
 #include "../vars/playtree.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines
 

modules/gui/skins2/events/evt_input.cpp

@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include "evt_input.hpp"
-#include "vlc_keys.h"
+#include "vlc_actions.h"
 
 const int
     EvtInput::kModNone=0,

modules/gui/skins2/events/evt_key.cpp

@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include "evt_key.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 
 const std::string EvtKey::getAsString() const

modules/gui/skins2/events/evt_key.hpp

@@ -49,7 +49,7 @@ public:
     ActionType_t getKeyState() const { return m_action; }
 
 private:
-    /// The concerned key, stored according to the '#define's in vlc_keys.h
+    /// The concerned key, stored according to the '#define's in vlc_actions.h
     /// but without the modifiers (which are stored in EvtInput)
     int m_key;
     /// Type of action

modules/gui/skins2/os2/os2_loop.cpp

@@ -34,7 +34,7 @@
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_refresh.hpp"
 #include "../events/evt_scroll.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 
 #define GET_X_MP( mp ) ( SHORT1FROMMP( mp ))

modules/gui/skins2/src/top_window.cpp

@@ -47,7 +47,7 @@
 #include "../utils/position.hpp"
 #include "../utils/ustring.hpp"
 
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_input.h>
 #include <vlc_url.h>
 #include <list>

modules/gui/skins2/src/vout_manager.hpp

@@ -28,7 +28,7 @@
 
 #include <vlc_vout.h>
 #include <vlc_vout_window.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include "../utils/position.hpp"
 #include "../commands/cmd_generic.hpp"
 #include "../controls/ctrl_video.hpp"

modules/gui/skins2/src/vout_window.cpp

@@ -30,7 +30,7 @@
 #include "os_window.hpp"
 #include "../events/evt_key.hpp"
 
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 
 VoutWindow::VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,

modules/gui/skins2/win32/win32_loop.cpp

@@ -34,7 +34,7 @@
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_refresh.hpp"
 #include "../events/evt_scroll.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 
 // XXX: Cygwin (at least) doesn't define these macros. Too bad...

modules/gui/skins2/x11/x11_loop.cpp

@@ -42,7 +42,7 @@
 #include "../events/evt_scroll.hpp"
 #include "../commands/async_queue.hpp"
 #include "../utils/var_bool.hpp"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 
 // Maximum interval between clicks for a double-click (in microsec)

modules/lua/libs/misc.c

@@ -40,7 +40,7 @@
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
 #include <vlc_interface.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_interrupt.h>
 
 #include "../vlc.h"

modules/spu/remoteosd.c

@@ -55,7 +55,8 @@
 #include <vlc_filter.h>
 #include <vlc_mouse.h>
 #include <vlc_subpicture.h>
-#include <vlc_keys.h>                  /* KEY_MODIFIER_CTRL */
+#include <vlc_actions.h>               /* KEY_MODIFIER_CTRL */
+
 #include <vlc_network.h>               /* net_*, htonl */
 #include <gcrypt.h>                    /* to encrypt password */
 #include <vlc_gcrypt.h>

modules/video_output/win32/win32touch.c

@@ -27,7 +27,7 @@
 
 #include "win32touch.h"
 
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 #include <assert.h>
 

modules/video_output/xcb/keys.c

@@ -36,7 +36,7 @@
 #include <xcb/xcb_keysyms.h>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 
 struct key_handler_t
 {

po/POTFILES.in

@@ -1,5 +1,6 @@
 # main sources
 include/vlc_access.h
+include/vlc_actions.h
 include/vlc_aout.h
 include/vlc_arrays.h
 include/vlc_bits.h
@@ -26,7 +27,6 @@ include/vlc_image.h
 include/vlc_input.h
 include/vlc_intf_strings.h
 include/vlc_iso_lang.h
-include/vlc_keys.h
 include/vlc/libvlc_events.h
 include/vlc/libvlc.h
 include/vlc/libvlc_media_list.h
@@ -70,7 +70,6 @@ src/config/core.c
 src/config/file.c
 src/config/help.c
 src/config/intf.c
-src/config/keys.c
 src/darwin/error.c
 src/extras/libc.c
 src/extras/tdestroy.c
@@ -100,6 +99,7 @@ src/interface/interface.c
 src/libvlc.c
 src/libvlc.h
 src/libvlc-module.c
+src/misc/actions.c
 src/misc/block.c
 src/misc/cpu.c
 src/misc/error.c

src/Makefile.am

@@ -23,6 +23,7 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
+	../include/vlc_actions.h \
 	../include/vlc_addons.h \
 	../include/vlc_aout.h \
 	../include/vlc_aout_volume.h \
@@ -58,7 +59,6 @@ pluginsinclude_HEADERS = \
 	../include/vlc_input.h \
 	../include/vlc_input_item.h \
 	../include/vlc_interface.h \
-	../include/vlc_keys.h \
 	../include/vlc_keystore.h \
 	../include/vlc_main.h \
 	../include/vlc_md5.h \
@@ -195,7 +195,6 @@ libvlccore_la_SOURCES = \
 	config/file.c \
 	config/help.c \
 	config/intf.c \
-	config/keys.c \
 	config/cmdline.c \
 	config/getopt.c \
 	config/vlc_getopt.h \
@@ -310,6 +309,7 @@ libvlccore_la_SOURCES = \
 	text/filesystem.c \
 	text/iso_lang.c \
 	text/iso-639_def.h \
+	misc/actions.c \
 	misc/background_worker.c \
 	misc/background_worker.h \
 	misc/md5.c \

src/config/cmdline.c

@@ -27,7 +27,7 @@
 
 #include <vlc_common.h>
 #include "../libvlc.h"
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_charset.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>

src/config/core.c

@@ -26,7 +26,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 

src/config/file.c

@@ -41,7 +41,7 @@
 #include "../libvlc.h"
 #include <vlc_charset.h>
 #include <vlc_fs.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 

src/libvlc-module.c

@@ -39,7 +39,7 @@
 #include "modules/modules.h"
 
 //#define Nothing here, this is just to prevent update-po from being stupid
-#include "vlc_keys.h"
+#include "vlc_actions.h"
 #include "vlc_meta.h"
 #include <vlc_aout.h>
 

src/config/keys.c → src/misc/actions.c

@@ -1,7 +1,7 @@
 /*****************************************************************************
- * keys.c: keys configuration
+ * actions.c: handle vlc actions
  *****************************************************************************
- * Copyright (C) 2003-2009 VLC authors and VideoLAN
+ * Copyright (C) 2003-2016 VLC authors and VideoLAN
  *
  * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
@@ -41,9 +41,9 @@
 #include <errno.h>
 
 #include <vlc_common.h>
-#include <vlc_keys.h>
+#include <vlc_actions.h>
 #include <vlc_charset.h>
-#include "configuration.h"
+#include "config/configuration.h"
 #include "libvlc.h"
 
 typedef struct key_descriptor_s