Changeset e0a120ef811bdb2d1bccdde0838105f6dba99669
- Timestamp:
- 05/04/08 19:45:47
(2 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1209923147 +0300
- git-parent:
[0a9fffb92ed32d042bc16f76a3c4735d60c6f086]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1209922625 +0300
- Message:
p_vlm is private data
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r0a9fffb |
re0a120e |
|
| 50 | 50 | vlc_object_t *p_interaction; ///< interface interaction object |
|---|
| 51 | 51 | |
|---|
| 52 | | vlm_t *p_vlm; ///< vlm if created from libvlc-common. |
|---|
| 53 | | /// (this is clearly private and |
|---|
| 54 | | // shouldn't be used) |
|---|
| 55 | | |
|---|
| 56 | 52 | void *p_stats_computer; ///< Input thread computing stats (needs cleanup) |
|---|
| 57 | 53 | global_stats_t *p_stats; ///< Global statistics |
|---|
| r0a9fffb |
re0a120e |
|
| 181 | 181 | p_libvlc->p_playlist = NULL; |
|---|
| 182 | 182 | p_libvlc->p_interaction = NULL; |
|---|
| 183 | | p_libvlc->p_vlm = NULL; |
|---|
| | 183 | priv->p_vlm = NULL; |
|---|
| 184 | 184 | p_libvlc->psz_object_name = strdup( "libvlc" ); |
|---|
| 185 | 185 | priv = libvlc_priv (p_libvlc); |
|---|
| … | … | |
| 770 | 770 | if( psz_parser && *psz_parser ) |
|---|
| 771 | 771 | { |
|---|
| 772 | | p_libvlc->p_vlm = vlm_New( p_libvlc ); |
|---|
| 773 | | if( !p_libvlc->p_vlm ) |
|---|
| | 772 | priv->p_vlm = vlm_New( p_libvlc ); |
|---|
| | 773 | if( !priv->p_vlm ) |
|---|
| 774 | 774 | msg_Err( p_libvlc, "VLM initialization failed" ); |
|---|
| 775 | 775 | } |
|---|
| … | … | |
| 933 | 933 | vout_thread_t * p_vout = NULL; |
|---|
| 934 | 934 | aout_instance_t * p_aout = NULL; |
|---|
| | 935 | libvlc_priv_t *priv = libvlc_priv (p_libvlc); |
|---|
| 935 | 936 | |
|---|
| 936 | 937 | /* Ask the interfaces to stop and destroy them */ |
|---|
| … | … | |
| 980 | 981 | |
|---|
| 981 | 982 | /* Destroy VLM if created in libvlc_InternalInit */ |
|---|
| 982 | | if( p_libvlc->p_vlm ) |
|---|
| 983 | | { |
|---|
| 984 | | vlm_Delete( p_libvlc->p_vlm ); |
|---|
| | 983 | if( priv->p_vlm ) |
|---|
| | 984 | { |
|---|
| | 985 | vlm_Delete( priv->p_vlm ); |
|---|
| 985 | 986 | } |
|---|
| 986 | 987 | #endif |
|---|
| r0a9fffb |
re0a120e |
|
| 179 | 179 | |
|---|
| 180 | 180 | module_t *p_memcpy_module; ///< Fast memcpy plugin used |
|---|
| | 181 | vlm_t *p_vlm; ///< VLM if created from libvlc-common.c |
|---|
| | 182 | |
|---|
| | 183 | httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) |
|---|
| 181 | 184 | } libvlc_priv_t; |
|---|
| 182 | 185 | |
|---|