From 6dad28316e1dca9b805e3aebdced04b059ddfdad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 14 Feb 2010 19:08:33 +0200
Subject: [PATCH] Gather all inhibit module in a directory (no code change)
---
modules/LIST | 6 +++---
modules/misc/Modules.am | 7 ++++---
modules/misc/{ => inhibit}/osso.c | 0
modules/misc/{xdg-screensaver.c => inhibit/xdg.c} | 0
modules/misc/{screensaver.c => inhibit/xscreensaver.c} | 0
po/POTFILES.in | 4 +++-
6 files changed, 10 insertions(+), 7 deletions(-)
rename modules/misc/{ => inhibit}/osso.c (100%)
rename modules/misc/{xdg-screensaver.c => inhibit/xdg.c} (100%)
rename modules/misc/{screensaver.c => inhibit/xscreensaver.c} (100%)
diff --git a/modules/LIST b/modules/LIST
index f1f762e23fcf..6af629789961 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -228,7 +228,7 @@ $Id$
* osd_parser: OSD import module
* osdmenu: video_filter for displaying and streaming a On Screen Display menu
* oss: audio output module using the OSS /dev/dsp interface
- * osso: Maemo screen unblanking module
+ * osso_screensaver: Maemo screen unblanking module
* packetizer_copy: Simple copy packetizer
* packetizer_dirac: Dirac video packetizer
* packetizer_flac: FLAC audio packetizer
@@ -275,7 +275,6 @@ $Id$
* scene: scene video filter
* schroedinger: Schroedinger video decoder
* screen: a input module that takes screenshots of the primary monitor
- * screensaver: screensaver disabling module
* sdl_image: SDL-based image decoder
* sharpen: Sharpen video filter
* shine: MP3 encoder using Shine, a fixed point implementation
@@ -371,9 +370,10 @@ $Id$
* xcb_window: XCB window provider
* xcb_x11: a X11 video output using XCB
* xcb_xv: a XVideo video output using XCB
- * xdg_screensaver: screensaver disabling module following XDG specifications
+ * xdg_screensaver: xdg-utils screensaver inhibition
* xml: LibXML xml parser
* xosd: X On Screen Display interface
+ * xscreensaver: Xscreensaver inhibition
* xtag: XTAG xml parser
* yuv: yuv video output
* yuvp: YUVP to YUVA/RGBA chroma converter
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index b6dcddece40f..c6b5bae4422c 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -8,7 +8,6 @@ if BUILD_LUA
SUBDIRS += lua
endif
-SOURCES_screensaver = screensaver.c
SOURCES_freetype = freetype.c text_renderer.h
SOURCES_win32text = win32text.c
SOURCES_quartztext = quartztext.c text_renderer.h
@@ -18,10 +17,12 @@ SOURCES_gnutls = gnutls.c dhparams.h
SOURCES_svg = svg.c
SOURCES_audioscrobbler = audioscrobbler.c
SOURCES_inhibit = inhibit.c
-SOURCES_xdg_screensaver = xdg-screensaver.c
-SOURCES_osso = osso.c
SOURCES_sqlite = sqlite.c
+SOURCES_xscreensaver = inhibit/screensaver.c
+SOURCES_xdg_screensaver = inhibit/xdg.c
+SOURCES_osso_screensaver = inhibit/osso.c
+
libvlc_LTLIBRARIES += \
libaudioscrobbler_plugin.la \
liblogger_plugin.la
diff --git a/modules/misc/osso.c b/modules/misc/inhibit/osso.c
similarity index 100%
rename from modules/misc/osso.c
rename to modules/misc/inhibit/osso.c
diff --git a/modules/misc/xdg-screensaver.c b/modules/misc/inhibit/xdg.c
similarity index 100%
rename from modules/misc/xdg-screensaver.c
rename to modules/misc/inhibit/xdg.c
diff --git a/modules/misc/screensaver.c b/modules/misc/inhibit/xscreensaver.c
similarity index 100%
rename from modules/misc/screensaver.c
rename to modules/misc/inhibit/xscreensaver.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01e638c0ff1d..fedd8bf7ff5f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -913,6 +913,9 @@ modules/misc/dummy/vout.c
modules/misc/freetype.c
modules/misc/gnutls.c
modules/misc/inhibit.c
+modules/misc/inhibit/osso.c
+modules/misc/inhibit/xdg.c
+modules/misc/inhibit/xscreensaver.c
modules/misc/logger.c
modules/misc/lua/demux.c
modules/misc/lua/intf.c
@@ -960,7 +963,6 @@ modules/misc/playlist/xspf.c
modules/misc/playlist/xspf.h
modules/misc/quartztext.c
modules/misc/rtsp.c
-modules/misc/screensaver.c
modules/misc/stats/decoder.c
modules/misc/stats/demux.c
modules/misc/stats/encoder.c
--
GitLab