Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC
Commits
c67934b0
Commit
c67934b0
authored
Apr 16, 2019
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove vlc_playlist_legacy
parent
376d2b56
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
1 addition
and
4205 deletions
+1
-4205
include/vlc_interface.h
include/vlc_interface.h
+0
-8
include/vlc_playlist_legacy.h
include/vlc_playlist_legacy.h
+0
-429
lib/media.c
lib/media.c
+0
-1
lib/playlist.c
lib/playlist.c
+0
-2
modules/gui/qt/dialogs/epg.cpp
modules/gui/qt/dialogs/epg.cpp
+0
-1
po/POTFILES.in
po/POTFILES.in
+0
-10
src/Makefile.am
src/Makefile.am
+0
-13
src/check_symbols
src/check_symbols
+1
-2
src/input/meta.c
src/input/meta.c
+0
-1
src/interface/interface.c
src/interface/interface.c
+0
-36
src/libvlc-module.c
src/libvlc-module.c
+0
-1
src/libvlc.c
src/libvlc.c
+0
-2
src/libvlccore.sym
src/libvlccore.sym
+0
-40
src/playlist_legacy/aout.c
src/playlist_legacy/aout.c
+0
-124
src/playlist_legacy/control.c
src/playlist_legacy/control.c
+0
-147
src/playlist_legacy/engine.c
src/playlist_legacy/engine.c
+0
-501
src/playlist_legacy/item.c
src/playlist_legacy/item.c
+0
-883
src/playlist_legacy/loadsave.c
src/playlist_legacy/loadsave.c
+0
-67
src/playlist_legacy/playlist_internal.h
src/playlist_legacy/playlist_internal.h
+0
-186
src/playlist_legacy/renderer.c
src/playlist_legacy/renderer.c
+0
-51
src/playlist_legacy/search.c
src/playlist_legacy/search.c
+0
-130
src/playlist_legacy/services_discovery.c
src/playlist_legacy/services_discovery.c
+0
-242
src/playlist_legacy/sort.c
src/playlist_legacy/sort.c
+0
-376
src/playlist_legacy/thread.c
src/playlist_legacy/thread.c
+0
-525
src/playlist_legacy/tree.c
src/playlist_legacy/tree.c
+0
-427
No files found.
include/vlc_interface.h
View file @
c67934b0
...
...
@@ -91,8 +91,6 @@ VLC_API int intf_Create( libvlc_int_t *, const char * );
VLC_API
void
libvlc_Quit
(
libvlc_int_t
*
);
VLC_API
playlist_t
*
pl_Get
(
struct
intf_thread_t
*
intf
);
/**
* Recover the main playlist from an interface module
*
...
...
@@ -101,12 +99,6 @@ VLC_API playlist_t *pl_Get( struct intf_thread_t *intf );
VLC_API
vlc_playlist_t
*
vlc_intf_GetMainPlaylist
(
intf_thread_t
*
intf
);
/**
* Retrieves the current input thread from the playlist.
* @note The returned object must be released with input_Release().
*/
#define pl_CurrentInput(intf) (playlist_CurrentInput(pl_Get(intf)))
/**
* @ingroup messages
* @{
...
...
include/vlc_playlist_legacy.h
deleted
100644 → 0
View file @
376d2b56
/*****************************************************************************
* vlc_playlist_legacy.h : Legacy playlist functions
*****************************************************************************
* Copyright (C) 1999-2004 VLC authors and VideoLAN
*
* Authors: Samuel Hocevar <sam@zoy.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.
*****************************************************************************/
#ifndef VLC_PLAYLIST_LEGACY_H_
#define VLC_PLAYLIST_LEGACY_H_
# ifdef __cplusplus
extern
"C"
{
# endif
#include <vlc_events.h>
TYPEDEF_ARRAY
(
playlist_item_t
*
,
playlist_item_array_t
)
struct
intf_thread_t
;
/**
* \defgroup playlist_legacy VLC playlist legacy
* \ingroup interface
* VLC playlist controls
* @{
* \file
* VLC playlist control interface
*
* The VLC playlist system has a tree structure. This allows advanced
* categorization, like for SAP streams (which are grouped by "sap groups").
*
* The base structure for all playlist operations is the playlist_item_t.
* This is essentially a node within the playlist tree. Each playlist item
* references an input_item_t which contains the input stream info, such as
* location, name and meta-data.
*
* A playlist item is uniquely identified by its input item:
* \ref playlist_ItemGetByInput(). A single input item cannot be used by more
* than one playlist item at a time; if necessary, a copy of the input item can
* be made instead.
*
* The same playlist tree is visible to all user interfaces. To arbitrate
* access, a lock is used, see \ref playlist_Lock() and \ref playlist_Unlock().
*
* Under the playlist root item node, the top-level items are the main
* media sources and include:
* - the actual playlist,
* - the service discovery root node, whose children are services discovery
* module instances.
*
* So, here is an example:
* \verbatim
* Inputs array
* - input 1 -> name = foo 1 uri = ...
* - input 2 -> name = foo 2 uri = ...
*
* Playlist items tree
* - playlist (id 1)
* - category 1 (id 2)
* - foo 2 (id 6 - input 2)
* \endverbatim
*
* Sometimes, an item creates subitems. This happens for the directory access
* for example. In that case, if the item is under the "playlist" top-level
* item and playlist is configured to be flat then the item will be deleted and
* replaced with new subitems. If the item is under another top-level item, it
* will be transformed to a node and removed from the list of all items without
* nodes.
*
* For "standard" item addition, you can use playlist_Add(), playlist_AddExt()
* (more options) or playlist_AddInput() if you already created your input
* item. This will add the item at the root of "Playlist" in each of the two trees.
*
* You can create nodes with playlist_NodeCreate() and can create items from
* existing input items to be placed under any node with
* playlist_NodeAddInput().
*
* To delete an item, use playlist_NodeDelete( p_item ).
*
* The playlist defines the following event variables:
*
* - "item-change": It will contain a pointer to the input_item_t of a
* changed input item monitored by the playlist.
*
* - "playlist-item-append": It will contain a pointer to a playlist_item_t.
* - "playlist-item-deleted": It will contain a pointer to the playlist_item_t
* about to be deleted.
*
* - "leaf-to-parent": It will contain the playlist_item_t->i_id of an item that is transformed
* into a node.
*
* The playlist contains rate-variable which is propagated to current input if
* available also rate-slower/rate-faster is in use.
*/
/** Helper structure to export to file part of the playlist */
typedef
struct
playlist_export_t
{
struct
vlc_object_t
obj
;
char
*
base_url
;
FILE
*
p_file
;
playlist_item_t
*
p_root
;
}
playlist_export_t
;
/** playlist item / node */
struct
playlist_item_t
{
input_item_t
*
p_input
;
/**< Linked input item */
playlist_item_t
**
pp_children
;
/**< Children nodes/items */
playlist_item_t
*
p_parent
;
/**< Item parent */
int
i_children
;
/**< Number of children, -1 if not a node */
unsigned
i_nb_played
;
/**< Times played */
int
i_id
;
/**< Playlist item specific id */
uint8_t
i_flags
;
/**< Flags \see playlist_item_flags_e */
};
typedef
enum
{
PLAYLIST_DBL_FLAG
=
0x04
,
/**< Is it disabled ? */
PLAYLIST_RO_FLAG
=
0x08
,
/**< Write-enabled ? */
PLAYLIST_SUBITEM_STOP_FLAG
=
0x40
,
/**< Must playlist stop if the item gets subitems ?*/
PLAYLIST_NO_INHERIT_FLAG
=
0x80
,
/**< Will children inherit flags the R/O flag ? */
}
playlist_item_flags_e
;
/** Playlist status */
typedef
enum
{
PLAYLIST_STOPPED
,
PLAYLIST_RUNNING
,
PLAYLIST_PAUSED
}
playlist_status_t
;
/** Structure containing information about the playlist */
struct
playlist_t
{
struct
vlc_object_t
obj
;
playlist_item_array_t
items
;
/**< Arrays of items */
playlist_item_array_t
current
;
/**< Items currently being played */
int
i_current_index
;
/**< Index in current array */
/* Predefined items */
playlist_item_t
root
;
playlist_item_t
*
p_playing
;
};
/* A bit of macro magic to generate an enum out of the following list,
* and later, to generate a list of static functions out of the same list.
* There is also SORT_RANDOM, which is always last and handled specially.
*/
#define VLC_DEFINE_SORT_FUNCTIONS \
DEF( SORT_ID )\
DEF( SORT_TITLE )\
DEF( SORT_TITLE_NODES_FIRST )\
DEF( SORT_ARTIST )\
DEF( SORT_GENRE )\
DEF( SORT_DURATION )\
DEF( SORT_TITLE_NUMERIC )\
DEF( SORT_ALBUM )\
DEF( SORT_TRACK_NUMBER )\
DEF( SORT_DESCRIPTION )\
DEF( SORT_RATING )\
DEF( SORT_URI )\
DEF( SORT_DISC_NUMBER )\
DEF( SORT_DATE )
#define DEF( s ) s,
enum
{
VLC_DEFINE_SORT_FUNCTIONS
SORT_RANDOM
,
NUM_SORT_FNS
=
SORT_RANDOM
};
#undef DEF
#ifndef VLC_INTERNAL_PLAYLIST_SORT_FUNCTIONS
#undef VLC_DEFINE_SORT_FUNCTIONS
#endif
enum
{
ORDER_NORMAL
=
0
,
ORDER_REVERSE
=
1
,
};
#define PLAYLIST_END -1
enum
pl_locked_state
{
pl_Locked
=
true
,
pl_Unlocked
=
false
};
/*****************************************************************************
* Prototypes
*****************************************************************************/
/* Helpers */
#define PL_LOCK playlist_Lock( p_playlist )
#define PL_UNLOCK playlist_Unlock( p_playlist )
#define PL_ASSERT_LOCKED assert(playlist_Locked(p_playlist))
/** Playlist commands */
enum
{
PLAYLIST_PLAY
,
/**< No arg. res=can fail*/
PLAYLIST_VIEWPLAY
,
/**< arg1= playlist_item_t*,*/
/** arg2 = playlist_item_t* , res=can fail */
PLAYLIST_TOGGLE_PAUSE
,
/**< No arg res=can fail */
PLAYLIST_STOP
,
/**< No arg res=can fail*/
PLAYLIST_SKIP
,
/**< arg1=int, res=can fail*/
PLAYLIST_PAUSE
,
/**< No arg */
PLAYLIST_RESUME
,
/**< No arg */
};
#define playlist_Play(p) playlist_Control(p,PLAYLIST_PLAY, pl_Unlocked )
#define playlist_TogglePause(p) \
playlist_Control(p, PLAYLIST_TOGGLE_PAUSE, pl_Unlocked)
#define playlist_Stop(p) playlist_Control(p,PLAYLIST_STOP, pl_Unlocked )
#define playlist_Next(p) playlist_Control(p,PLAYLIST_SKIP, pl_Unlocked, 1)
#define playlist_Prev(p) playlist_Control(p,PLAYLIST_SKIP, pl_Unlocked, -1)
#define playlist_Skip(p,i) playlist_Control(p,PLAYLIST_SKIP, pl_Unlocked, (i) )
#define playlist_Pause(p) \
playlist_Control(p, PLAYLIST_PAUSE, pl_Unlocked)
#define playlist_Resume(p) \
playlist_Control(p, PLAYLIST_RESUME, pl_Unlocked)
/**
* Locks the playlist.
*
* This function locks the playlist. While the playlist is locked, no other
* thread can modify the playlist tree layout or current playing item and node.
*
* Locking the playlist is necessary before accessing, either for reading or
* writing, any playlist item.
*
* \note Because of the potential for lock inversion / deadlocks, locking the
* playlist shall not be attemped while holding an input item lock. An input
* item lock can be acquired while holding the playlist lock.
*
* While holding the playlist lock, a thread shall not attempt to:
* - probe, initialize or deinitialize a module or a plugin,
* - install or deinstall a variable or event callback,
* - set a variable or trigger a variable callback, with the sole exception
* of the playlist core triggering add/remove/leaf item callbacks,
* - invoke a module/plugin callback other than:
* - playlist export,
* - logger message callback.
*/
VLC_API
void
playlist_Lock
(
playlist_t
*
);
/**
* Unlocks the playlist.
*
* This function unlocks the playlist, allowing other threads to lock it. The
* calling thread must have called playlist_Lock() before.
*
* This function invalidates all or any playlist item pointers.
* There are no ways to ensure that playlist items are not modified or deleted
* by another thread past this function call.
*
* To retain a reference to a playlist item while not holding the playlist
* lock, a thread should take a reference to the input item within the
* playlist item before unlocking. If this is not practical, then the thread
* can store the playlist item ID (i_id) before unlocking.
* Either way, this will not ensure that the playlist item is not deleted, so
* the thread must be ready to handle that case later when calling
* playlist_ItemGetByInput() or playlist_ItemGetById().
*
* Furthermore, if ID is used, then the playlist item might be deleted, and
* another item could be assigned the same ID. To avoid that problem, use
* the input item instead of the ID.
*/
VLC_API
void
playlist_Unlock
(
playlist_t
*
);
VLC_API
bool
playlist_Locked
(
const
playlist_t
*
);
#define playlist_AssertLocked(pl) (assert(playlist_Locked(pl)), pl)
VLC_API
void
playlist_Deactivate
(
playlist_t
*
);
/**
* Do a playlist action.
* If there is something in the playlist then you can do playlist actions.
* Possible queries are listed in vlc_common.h
* \param p_playlist the playlist to do the command on
* \param i_query the command to do
* \param b_locked TRUE if playlist is locked when entering this function
* \param variable number of arguments
*/
VLC_API
void
playlist_Control
(
playlist_t
*
p_playlist
,
int
i_query
,
int
b_locked
,
...
);
static
inline
void
playlist_ViewPlay
(
playlist_t
*
pl
,
playlist_item_t
*
node
,
playlist_item_t
*
item
)
{
playlist_Control
(
pl
,
PLAYLIST_VIEWPLAY
,
pl_Locked
,
node
,
item
);
}
/** Get current playing input. The object is retained.
*/
VLC_API
input_thread_t
*
playlist_CurrentInput
(
playlist_t
*
p_playlist
)
VLC_USED
;
VLC_API
input_thread_t
*
playlist_CurrentInputLocked
(
playlist_t
*
p_playlist
)
VLC_USED
;
/** Get the duration of all items in a node.
*/
VLC_API
vlc_tick_t
playlist_GetNodeDuration
(
playlist_item_t
*
);
/** Clear the playlist
* \param b_locked TRUE if playlist is locked when entering this function
*/
VLC_API
void
playlist_Clear
(
playlist_t
*
,
bool
);
/* Playlist sorting */
VLC_API
int
playlist_TreeMove
(
playlist_t
*
,
playlist_item_t
*
,
playlist_item_t
*
,
int
);
VLC_API
int
playlist_TreeMoveMany
(
playlist_t
*
,
int
,
playlist_item_t
**
,
playlist_item_t
*
,
int
);
VLC_API
int
playlist_RecursiveNodeSort
(
playlist_t
*
,
playlist_item_t
*
,
int
,
int
);
VLC_API
playlist_item_t
*
playlist_CurrentPlayingItem
(
playlist_t
*
)
VLC_USED
;
VLC_API
int
playlist_Status
(
playlist_t
*
);
/**
* Export a node of the playlist to a certain type of playlistfile
* \param psz_filename the location where the exported file will be saved
* \param psz_type the type of playlist file to create (m3u, pls, ..)
* \return VLC_SUCCESS on success
*/
VLC_API
int
playlist_Export
(
playlist_t
*
p_playlist
,
const
char
*
psz_name
,
const
char
*
psz_type
);
/**
* Open a playlist file, add its content to the current playlist
*/
VLC_API
int
playlist_Import
(
playlist_t
*
p_playlist
,
const
char
*
psz_file
);
/********************** Services discovery ***********************/
/** Add a service discovery module */
VLC_API
int
playlist_ServicesDiscoveryAdd
(
playlist_t
*
,
const
char
*
);
/** Remove a services discovery module by name */
VLC_API
int
playlist_ServicesDiscoveryRemove
(
playlist_t
*
,
const
char
*
);
/** Check whether a given SD is loaded */
VLC_API
bool
playlist_IsServicesDiscoveryLoaded
(
playlist_t
*
,
const
char
*
)
VLC_DEPRECATED
;
/** Query a services discovery */
VLC_API
int
playlist_ServicesDiscoveryControl
(
playlist_t
*
,
const
char
*
,
int
,
...
);
/********************** Renderer ***********************/
/**
* Sets a renderer or remove the current one
* @param p_item The renderer item to be used, or NULL to disable the current
* one. If a renderer is provided, its reference count will be
* incremented.
*/
VLC_API
int
playlist_SetRenderer
(
playlist_t
*
p_pl
,
vlc_renderer_item_t
*
p_item
);
/********************************************************
* Item management
********************************************************/
/******************** Item addition ********************/
VLC_API
int
playlist_Add
(
playlist_t
*
,
const
char
*
,
bool
);
VLC_API
int
playlist_AddExt
(
playlist_t
*
,
const
char
*
,
const
char
*
,
bool
,
int
,
const
char
*
const
*
,
unsigned
);
VLC_API
int
playlist_AddInput
(
playlist_t
*
,
input_item_t
*
,
bool
);
VLC_API
playlist_item_t
*
playlist_NodeAddInput
(
playlist_t
*
,
input_item_t
*
,
playlist_item_t
*
,
int
);
VLC_API
int
playlist_NodeAddCopy
(
playlist_t
*
,
playlist_item_t
*
,
playlist_item_t
*
,
int
);
/********************************** Item search *************************/
VLC_API
playlist_item_t
*
playlist_ItemGetById
(
playlist_t
*
,
int
)
VLC_USED
;
VLC_API
playlist_item_t
*
playlist_ItemGetByInput
(
playlist_t
*
,
const
input_item_t
*
)
VLC_USED
;
VLC_API
int
playlist_LiveSearchUpdate
(
playlist_t
*
,
playlist_item_t
*
,
const
char
*
,
bool
);
/********************************************************
* Tree management
********************************************************/
/* Node management */
VLC_API
playlist_item_t
*
playlist_NodeCreate
(
playlist_t
*
,
const
char
*
,
playlist_item_t
*
p_parent
,
int
i_pos
,
int
i_flags
);
VLC_API
playlist_item_t
*
playlist_ChildSearchName
(
playlist_item_t
*
,
const
char
*
)
VLC_USED
;
VLC_API
void
playlist_NodeDelete
(
playlist_t
*
,
playlist_item_t
*
);
/**************************
* Audio output management
**************************/
VLC_API
struct
audio_output
*
playlist_GetAout
(
playlist_t
*
);
VLC_API
float
playlist_VolumeGet
(
playlist_t
*
);
VLC_API
int
playlist_VolumeSet
(
playlist_t
*
,
float
);
VLC_API
int
playlist_VolumeUp
(
playlist_t
*
,
int
,
float
*
);
#define playlist_VolumeDown(a, b, c) playlist_VolumeUp(a, -(b), c)
VLC_API
int
playlist_MuteSet
(
playlist_t
*
,
bool
);
VLC_API
int
playlist_MuteGet
(
playlist_t
*
);
static
inline
int
playlist_MuteToggle
(
playlist_t
*
pl
)
{
int
val
=
playlist_MuteGet
(
pl
);
if
(
val
>=
0
)
val
=
playlist_MuteSet
(
pl
,
!
val
);
return
val
;
}
VLC_API
void
playlist_EnableAudioFilter
(
playlist_t
*
,
const
char
*
,
bool
);
/** Tell if the playlist is empty */
#define playlist_IsEmpty(p_playlist) \
(playlist_AssertLocked(p_playlist)->items.i_size == 0)
/** Tell the number of items in the current playing context */
#define playlist_CurrentSize(p_playlist) \
(playlist_AssertLocked(p_playlist)->current.i_size)
/** @} */
# ifdef __cplusplus
}
# endif
#endif
lib/media.c
View file @
c67934b0
...
...
@@ -36,7 +36,6 @@
#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_meta.h>
#include <vlc_playlist_legacy.h>
/* For the preparser */
#include <vlc_url.h>
#include <vlc_thumbnailer.h>
...
...
lib/playlist.c
View file @
c67934b0
...
...
@@ -29,8 +29,6 @@
#include <vlc/vlc.h>
#include <vlc_playlist_legacy.h>
#include <assert.h>
void
libvlc_playlist_play
(
libvlc_instance_t
*
p_instance
)
...
...
modules/gui/qt/dialogs/epg.cpp
View file @
c67934b0
...
...
@@ -28,7 +28,6 @@
#include "components/epg/EPGWidget.hpp"
#include "components/epg/EPGItem.hpp"
#include <vlc_playlist_legacy.h>
#include <QVBoxLayout>
#include <QSplitter>
...
...
po/POTFILES.in
View file @
c67934b0
...
...
@@ -35,7 +35,6 @@ include/vlc_tick.h
include/vlc_network.h
include/vlc_objects.h
include/vlc_pgpkey.h
include/vlc_playlist_legacy.h
include/vlc_plugin.h
include/vlc_rand.h
include/vlc_services_discovery.h
...
...
@@ -123,15 +122,6 @@ src/network/rootbind.c
src/network/tcp.c
src/network/tls.c
src/network/udp.c
src/playlist_legacy/control.c
src/playlist_legacy/engine.c
src/playlist_legacy/item.c
src/playlist_legacy/loadsave.c
src/playlist_legacy/playlist_internal.h
src/playlist_legacy/search.c
src/playlist_legacy/sort.c
src/playlist_legacy/thread.c
src/playlist_legacy/tree.c
src/stream_output/sap.c
src/stream_output/sdp.c
src/stream_output/stream_output.c
...
...
src/Makefile.am
View file @
c67934b0
...
...
@@ -77,7 +77,6 @@ pluginsinclude_HEADERS = \
../include/vlc_picture.h
\
../include/vlc_picture_fifo.h
\
../include/vlc_picture_pool.h
\
../include/vlc_playlist_legacy.h
\
../include/vlc_player.h
\
../include/vlc_playlist.h
\
../include/vlc_playlist_export.h
\
...
...
@@ -222,18 +221,6 @@ libvlccore_la_SOURCES = \
modules/textdomain.c
\
interface/dialog.c
\
interface/interface.c
\
playlist_legacy/playlist_internal.h
\
playlist_legacy/aout.c
\
playlist_legacy/thread.c
\
playlist_legacy/control.c
\
playlist_legacy/engine.c
\
playlist_legacy/sort.c
\
playlist_legacy/loadsave.c
\
playlist_legacy/tree.c
\
playlist_legacy/item.c
\
playlist_legacy/search.c
\
playlist_legacy/services_discovery.c
\
playlist_legacy/renderer.c
\
playlist/content.c
\
playlist/content.h
\
playlist/control.c
\
...
...
src/check_symbols
View file @
c67934b0
...
...
@@ -15,7 +15,7 @@ cat libvlccore.sym | grep -v \
-e
'^image_'
-e
'^block_'
-e
'^picture_'
-e
'^subpicture_'
\
-e
'^es_format'
-e
'^[asv]out_'
-e
'^spu_'
-e
'^filter_'
\
-e
'^video_format_'
\
-e
'^playlist_'
-e
'^services_discovery_'
-e
'^intf_'
\
-e
'^services_discovery_'
-e
'^intf_'
\
-e
'^dialog_'
-e
'^update_'
-e
'^addons\?_'
-e
'^fingerprinter_'
\
-e
'^text_style_'
-e
'^text_segment_'
\
-e
'^net_'
-e
'^httpd_'
\
...
...
@@ -24,7 +24,6 @@ cat libvlccore.sym | grep -v \
-e
'^us_'
-e
'^utf8_'
-e
'^xml_'
-e
'^GetLang_'
\
-e
'^m\(date\|sleep\|wait\)$'
-e
'^[A-Z][a-z]*Charset$'
-e
'MD5$'
\
-e
'^NTPtime64$'
-e
'^secstotimestr$'
\
-e
'^pl_Get'
\
&&
exit
1
echo
"None found."
src/input/meta.c
View file @
c67934b0
...
...
@@ -28,7 +28,6 @@
#include <assert.h>
#include <vlc_common.h>
#include <vlc_playlist_legacy.h>
#include <vlc_url.h>
#include <vlc_arrays.h>
#include <vlc_modules.h>
...
...
src/interface/interface.c
View file @
c67934b0
...
...
@@ -41,45 +41,14 @@
#include <vlc_common.h>
#include <vlc_modules.h>
#include <vlc_interface.h>
#include <vlc_playlist_legacy.h>
#include <vlc_playlist.h>
#include "libvlc.h"
#include "playlist_legacy/playlist_internal.h"
#include "../lib/libvlc_internal.h"
#include "input/player.h"
static
int
AddIntfCallback
(
vlc_object_t
*
,
char
const
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
/* This lock ensures that the playlist is created only once (per instance). It
* also protects the list of running interfaces against concurrent access,
* either to add or remove an interface.
*
* However, it does NOT protect from destruction of the playlist by
* intf_DestroyAll(). Instead, care must be taken that intf_Create() and any
* other function that depends on the playlist is only called BEFORE
* intf_DestroyAll() has the possibility to destroy all interfaces.
*/
static
vlc_mutex_t
old_playlist_lock
=
VLC_STATIC_MUTEX
;
static
playlist_t
*
old_playlist
=
NULL
;
/**
* Creates the playlist if necessary, and return a pointer to it.
* @note The playlist is not reference-counted. So the pointer is only valid
* until intf_DestroyAll() destroys interfaces.
*/
playlist_t
*
pl_Get
(
struct
intf_thread_t
*
intf
)
{
assert
(
intf
);
vlc_mutex_lock
(
&
old_playlist_lock
);
if
(
old_playlist
==
NULL
)
old_playlist
=
playlist_Create
(
VLC_OBJECT
(
intf
));
vlc_mutex_unlock
(
&
old_playlist_lock
);
return
old_playlist
;
}
static
void
PlaylistConfigureFromVariables
(
vlc_playlist_t
*
playlist
,
vlc_object_t
*
obj
)
{
...
...
@@ -325,11 +294,6 @@ void intf_DestroyAll(libvlc_int_t *libvlc)
vlc_mutex_lock
(
&
priv
->
lock
);
}
vlc_mutex_unlock
(
&
priv
->
lock
);
vlc_mutex_lock
(
&
old_playlist_lock
);
if
(
old_playlist
)
playlist_Destroy
(
old_playlist
);
vlc_mutex_unlock
(
&
old_playlist_lock
);
}
/* Following functions are local */
...
...
src/libvlc-module.c
View file @
c67934b0
...
...
@@ -35,7 +35,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_cpu.h>
#include <vlc_playlist_legacy.h>
#include "libvlc.h"
#include "modules/modules.h"
...
...
src/libvlc.c
View file @
c67934b0
...
...
@@ -51,7 +51,6 @@
#include "config/vlc_getopt.h"
#include <vlc_playlist_legacy.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
...
...
@@ -67,7 +66,6 @@