[vlc-commits] modules: remove attachment access module
Thomas Guillem
git at videolan.org
Fri Jul 20 17:23:11 CEST 2018
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jul 20 15:30:01 2018 +0200| [f5620857e9a067febe7d5f533460a4c4888827dc] | committer: Thomas Guillem
modules: remove attachment access module
Replaced by ce263157c68c9e9b6b212a69eb03f1e8caa860d4
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5620857e9a067febe7d5f533460a4c4888827dc
---
modules/MODULES_LIST | 1 -
modules/access/Makefile.am | 3 -
modules/access/attachment.c | 165 --------------------------------------------
po/POTFILES.in | 1 -
4 files changed, 170 deletions(-)
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index ee364c299e..e1978cc6e4 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -45,7 +45,6 @@ $Id$
* aribcam: ARIB STD-B25 decoder/virtual CAM
* aribsub: ARIB subtitles decoder
* asf: ASF demuxer
- * attachment: Attachment access module
* au: AU file demuxer
* audio_format: helper module for audio transcoding
* audiobargraph_a: audiobargraph audio plugin
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 746ada2228..70050ad21e 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -5,9 +5,6 @@ AM_CPPFLAGS += -I$(srcdir)/access
### Files ###
-libattachment_plugin_la_SOURCES = access/attachment.c
-access_LTLIBRARIES += libattachment_plugin.la
-
libdcp_plugin_la_SOURCES = access/dcp/dcpparser.h access/dcp/dcp.cpp access/dcp/dcpparser.cpp access/dcp/dcpdecrypt.cpp
if HAVE_ASDCP
libdcp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(ASDCP_CFLAGS)
diff --git a/modules/access/attachment.c b/modules/access/attachment.c
deleted file mode 100644
index cb63bb3aa5..0000000000
--- a/modules/access/attachment.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*****************************************************************************
- * attachment.c: Input reading an attachment.
- *****************************************************************************
- * Copyright (C) 2009 Laurent Aimar
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
- *
- * This program 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 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_access.h>
-#include <vlc_input.h>
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int Open (vlc_object_t *);
-static void Close(vlc_object_t *);
-
-vlc_module_begin()
- set_shortname(N_("Attachment"))
- set_description(N_("Attachment input"))
- set_category(CAT_INPUT)
- set_subcategory(SUBCAT_INPUT_ACCESS)
-
- set_capability("access", 0)
- add_shortcut("attachment")
- set_callbacks(Open, Close)
-vlc_module_end()
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static ssize_t Read(stream_t *, void *, size_t);
-static int Seek(stream_t *, uint64_t);
-static int Control(stream_t *, int, va_list);
-
-typedef struct
-{
- input_attachment_t *attachment;
- size_t offset;
-} access_sys_t;
-
-/* */
-static int Open(vlc_object_t *object)
-{
- stream_t *access = (stream_t *)object;
-
- input_thread_t *input = access->p_input;
- if (!input)
- return VLC_EGENERIC;
-
- access_sys_t *sys = vlc_obj_malloc(object, sizeof (*sys));
- if (unlikely(sys == NULL))
- return VLC_ENOMEM;
-
- if (input_Control(input, INPUT_GET_ATTACHMENT, &sys->attachment,
- access->psz_location))
- sys->attachment = NULL;
-
- if (sys->attachment == NULL) {
- msg_Err(access, "Failed to find the attachment '%s'",
- access->psz_location);
- return VLC_EGENERIC;
- }
-
- sys->offset = 0;
-
- /* */
- access->pf_read = Read;
- access->pf_block = NULL;
- access->pf_control = Control;
- access->pf_seek = Seek;
- access->p_sys = sys;
- return VLC_SUCCESS;
-}
-
-/* */
-static void Close(vlc_object_t *object)
-{
- stream_t *access = (stream_t *)object;
- access_sys_t *sys = access->p_sys;
-
- vlc_input_attachment_Delete(sys->attachment);
-}
-
-/* */
-static ssize_t Read(stream_t *access, void *buffer, size_t size)
-{
- access_sys_t *sys = access->p_sys;
- input_attachment_t *a = sys->attachment;
-
- if (sys->offset >= (uint64_t)a->i_data)
- return 0;
-
- const size_t copy = __MIN(size, a->i_data - sys->offset);
- memcpy(buffer, (uint8_t *)a->p_data + sys->offset, copy);
- sys->offset += copy;
- return copy;
-}
-
-/* */
-static int Seek(stream_t *access, uint64_t position)
-{
- access_sys_t *sys = access->p_sys;
- input_attachment_t *a = sys->attachment;
-
- if (position > a->i_data)
- position = a->i_data;
-
- sys->offset = position;
- return VLC_SUCCESS;
-}
-
-/* */
-static int Control(stream_t *access, int query, va_list args)
-{
- access_sys_t *sys = access->p_sys;
-
- switch (query)
- {
- case STREAM_CAN_SEEK:
- case STREAM_CAN_FASTSEEK:
- case STREAM_CAN_PAUSE:
- case STREAM_CAN_CONTROL_PACE:
- *va_arg(args, bool *) = true;
- break;
- case STREAM_GET_SIZE:
- *va_arg(args, uint64_t *) = sys->attachment->i_data;
- break;
- case STREAM_GET_PTS_DELAY:
- *va_arg(args, vlc_tick_t *) = DEFAULT_PTS_DELAY;
- break;
- case STREAM_SET_PAUSE_STATE:
- return VLC_SUCCESS;
-
- default:
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e2c4251735..ab257a3402 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -163,7 +163,6 @@ lib/video.c
# modules
modules/access/alsa.c
-modules/access/attachment.c
modules/access/avcapture.m
modules/access/avio.h
modules/access/bluray.c
More information about the vlc-commits
mailing list