videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

core: remove global *_sys_t typedefs 

Do not declare *_sys_t typedefs globally in vlc_common.h. Instead,
declare them locally in each module that provides a definition.

This paves the way to move C++ definitions into anonymous namespaces in
order to respect C++ ODR.

The picture_resource_t and sout_stream_id_sys_t typedefs will be handled
separately, since they require specific additional changes.

See #18033

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
pull/70/head
Romain Vimont 8 years ago
committed by Jean-Baptiste Kempf
parent
1bbd0eb5c0
commit
ff2901aff3
351 changed files with 766 additions and 737 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      include/vlc_common.h
  2. 4
      modules/access/alsa.c
  3. 4
      modules/access/attachment.c
  4. 4
      modules/access/avcapture.m
  5. 9
      modules/access/avio.c
  6. 9
      modules/access/bluray.c
  7. 8
      modules/access/cdda.c
  8. 4
      modules/access/concat.c
  9. 4
      modules/access/dc1394.c
  10. 4
      modules/access/directory.c
  11. 4
      modules/access/dshow/access.h
  12. 4
      modules/access/dsm/sd.c
  13. 4
      modules/access/dtv/access.c
  14. 4
      modules/access/dv.c
  15. 4
      modules/access/dvb/access.c
  16. 4
      modules/access/dvdnav.c
  17. 4
      modules/access/dvdread.c
  18. 4
      modules/access/file.c
  19. 3
      modules/access/ftp.c
  20. 4
      modules/access/http.c
  21. 4
      modules/access/http/access.c
  22. 4
      modules/access/idummy.c
  23. 4
      modules/access/imem-access.c
  24. 4
      modules/access/imem.c
  25. 4
      modules/access/jack.c
  26. 4
      modules/access/linsys/linsys_hdsdi.c
  27. 4
      modules/access/linsys/linsys_sdi.c
  28. 4
      modules/access/mms/mms.c
  29. 4
      modules/access/mms/mmsh.h
  30. 4
      modules/access/mms/mmstu.h
  31. 4
      modules/access/nfs.c
  32. 4
      modules/access/oss.c
  33. 4
      modules/access/pulse.c
  34. 4
      modules/access/qtsound.m
  35. 4
      modules/access/rdp.c
  36. 4
      modules/access/rtp/rtp.h
  37. 4
      modules/access/rtsp/access.c
  38. 4
      modules/access/samba.c
  39. 5
      modules/access/satip.c
  40. 4
      modules/access/screen/screen.h
  41. 4
      modules/access/screen/wayland.c
  42. 4
      modules/access/screen/xcb.c
  43. 4
      modules/access/sftp.c
  44. 2
      modules/access/shm.c
  45. 4
      modules/access/srt.c
  46. 4
      modules/access/timecode.c
  47. 4
      modules/access/udp.c
  48. 4
      modules/access/unc.c
  49. 4
      modules/access/v4l2/access.c
  50. 4
      modules/access/v4l2/demux.c
  51. 4
      modules/access/v4l2/radio.c
  52. 4
      modules/access/vcd/vcd.c
  53. 4
      modules/access/vdr.c
  54. 4
      modules/access/vnc.c
  55. 4
      modules/access/wasapi.c
  56. 4
      modules/access_output/http.c
  57. 4
      modules/access_output/livehttp.c
  58. 4
      modules/access_output/shout.c
  59. 4
      modules/access_output/srt.c
  60. 4
      modules/access_output/udp.c
  61. 4
      modules/audio_filter/audiobargraph_a.c
  62. 4
      modules/audio_filter/channel_mixer/dolby.c
  63. 10
      modules/audio_filter/channel_mixer/headphone.c
  64. 8
      modules/audio_filter/channel_mixer/mono.c
  65. 4
      modules/audio_filter/channel_mixer/remap.c
  66. 4
      modules/audio_filter/channel_mixer/spatialaudio.cpp
  67. 4
      modules/audio_filter/channel_mixer/trivial.c
  68. 2
      modules/audio_filter/chorus_flanger.c
  69. 4
      modules/audio_filter/compressor.c
  70. 4
      modules/audio_filter/converter/tospdif.c
  71. 4
      modules/audio_filter/equalizer.c
  72. 4
      modules/audio_filter/gain.c
  73. 6
      modules/audio_filter/normvol.c
  74. 4
      modules/audio_filter/param_eq.c
  75. 4
      modules/audio_filter/resampler/bandlimited.c
  76. 6
      modules/audio_filter/resampler/soxr.c
  77. 2
      modules/audio_filter/resampler/speex.c
  78. 2
      modules/audio_filter/resampler/src.c
  79. 4
      modules/audio_filter/scaletempo.c
  80. 4
      modules/audio_filter/stereo_widen.c
  81. 4
      modules/audio_output/alsa.c
  82. 4
      modules/audio_output/amem.c
  83. 5
      modules/audio_output/audiotrack.c
  84. 4
      modules/audio_output/audiounit_ios.m
  85. 4
      modules/audio_output/auhal.c
  86. 4
      modules/audio_output/directsound.c
  87. 4
      modules/audio_output/file.c
  88. 18
      modules/audio_output/jack.c
  89. 4
      modules/audio_output/kai.c
  90. 4
      modules/audio_output/mmdevice.c
  91. 4
      modules/audio_output/opensles_android.c
  92. 4
      modules/audio_output/oss.c
  93. 4
      modules/audio_output/pulse.c
  94. 4
      modules/audio_output/sndio.c
  95. 5
      modules/audio_output/tizen_audio.c
  96. 3
      modules/audio_output/waveout.c
  97. 4
      modules/audio_output/winstore.c
  98. 4
      modules/codec/a52.c
  99. 4
      modules/codec/adpcm.c
  100. 4
      modules/codec/aes3.c

15
include/vlc_common.h
View File

@ -338,7 +338,6 @@ typedef struct date_t date_t;
typedef struct playlist_t playlist_t;
typedef struct playlist_item_t playlist_item_t;
typedef struct services_discovery_t services_discovery_t;
typedef struct services_discovery_sys_t services_discovery_sys_t;
typedef struct vlc_renderer_discovery_t vlc_renderer_discovery_t;
typedef struct vlc_renderer_item_t vlc_renderer_item_t;
@ -352,14 +351,10 @@ typedef struct config_category_t config_category_t;
typedef struct input_thread_t input_thread_t;
typedef struct input_item_t input_item_t;
typedef struct input_item_node_t input_item_node_t;
typedef struct access_sys_t access_sys_t;
typedef struct stream_t stream_t;
typedef struct stream_sys_t stream_sys_t;
typedef struct stream_t demux_t;
typedef struct demux_sys_t demux_sys_t;
typedef struct es_out_t es_out_t;
typedef struct es_out_id_t es_out_id_t;
typedef struct es_out_sys_t es_out_sys_t;
typedef struct seekpoint_t seekpoint_t;
typedef struct info_t info_t;
typedef struct info_category_t info_category_t;
@ -374,7 +369,6 @@ typedef struct video_palette_t video_palette_t;
/* Audio */
typedef struct audio_output audio_output_t;
typedef struct aout_sys_t aout_sys_t;
typedef audio_format_t audio_sample_format_t;
/* Video */
@ -399,29 +393,23 @@ typedef struct sout_input_t sout_input_t;
typedef struct sout_packetizer_input_t sout_packetizer_input_t;
typedef struct sout_access_out_t sout_access_out_t;
typedef struct sout_access_out_sys_t sout_access_out_sys_t;
typedef struct sout_mux_t sout_mux_t;
typedef struct sout_mux_sys_t sout_mux_sys_t;
typedef struct sout_stream_t sout_stream_t;
typedef struct sout_stream_sys_t sout_stream_sys_t;
typedef struct config_chain_t config_chain_t;
typedef struct session_descriptor_t session_descriptor_t;
/* Decoders */
typedef struct decoder_t decoder_t;
typedef struct decoder_sys_t decoder_sys_t;
typedef struct decoder_synchro_t decoder_synchro_t;
/* Encoders */
typedef struct encoder_t encoder_t;
typedef struct encoder_sys_t encoder_sys_t;
/* Filters */
typedef struct filter_t filter_t;
typedef struct filter_sys_t filter_sys_t;
/* Network */
typedef struct vlc_url_t vlc_url_t;
@ -438,13 +426,10 @@ typedef struct md5_s md5_t;
/* XML */
typedef struct xml_t xml_t;
typedef struct xml_sys_t xml_sys_t;
typedef struct xml_reader_t xml_reader_t;
typedef struct xml_reader_sys_t xml_reader_sys_t;
/* vod server */
typedef struct vod_t vod_t;
typedef struct vod_sys_t vod_sys_t;
typedef struct vod_media_t vod_media_t;
/* VLM */

4
modules/access/alsa.c
View File

@ -122,7 +122,7 @@ static void DumpDeviceStatus (vlc_object_t *obj, snd_pcm_t *pcm)
#define DumpDeviceStatus(o, p) DumpDeviceStatus(VLC_OBJECT(o), p)
struct demux_sys_t
typedef struct
{
snd_pcm_t *pcm;
es_out_id_t *es;
@ -132,7 +132,7 @@ struct demux_sys_t
mtime_t caching;
snd_pcm_uframes_t period_size;
unsigned rate;
};
} demux_sys_t;
static void Poll (snd_pcm_t *pcm, int canc)
{

4
modules/access/attachment.c
View File

@ -58,11 +58,11 @@ static ssize_t Read(stream_t *, void *, size_t);
static int Seek(stream_t *, uint64_t);
static int Control(stream_t *, int, va_list);
struct access_sys_t
typedef struct
{
input_attachment_t *attachment;
size_t offset;
};
} access_sys_t;
/* */
static int Open(vlc_object_t *object)

4
modules/access/avcapture.m
View File

@ -228,7 +228,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
* Struct
*****************************************************************************/
struct demux_sys_t
typedef struct demux_sys_t
{
CFTypeRef _Nullable session; // AVCaptureSession
CFTypeRef _Nullable device; // AVCaptureDevice
@ -237,7 +237,7 @@ struct demux_sys_t
es_format_t fmt;
int height, width;
BOOL b_es_setup;
};
} demux_sys_t;
/*****************************************************************************
* Open:

9
modules/access/avio.c
View File

@ -65,15 +65,16 @@ static int UrlInterruptCallback(void *access)
return vlc_killed();
}
struct access_sys_t
typedef struct
{
AVIOContext *context;
int64_t size;
};
} access_sys_t;
struct sout_access_out_sys_t {
typedef struct
{
AVIOContext *context;
};
} sout_access_out_sys_t;
/* */

9
modules/access/bluray.c
View File

@ -145,7 +145,7 @@ typedef struct bluray_overlay_t
struct subpicture_updater_sys_t *p_updater;
} bluray_overlay_t;
struct demux_sys_t
typedef struct
{
BLURAY *bluray;
@ -200,7 +200,7 @@ struct demux_sys_t
/* Used to store bluray disc path */
char *psz_bd_path;
};
} demux_sys_t;
struct subpicture_updater_sys_t
{
@ -921,9 +921,10 @@ static void blurayClose(vlc_object_t *object)
* Elementary streams handling
*****************************************************************************/
struct es_out_sys_t {
typedef struct
{
demux_t *p_demux;
};
} es_out_sys_t;
typedef struct fmt_es_pair {
int i_id;

8
modules/access/cdda.c
View File

@ -115,7 +115,7 @@ static vcddev_t *DiscOpen(vlc_object_t *obj, const char *location,
/* how many blocks Demux() will read in each iteration */
#define CDDA_BLOCKS_ONCE 20
struct demux_sys_t
typedef struct
{
vcddev_t *vcddev; /* vcd device descriptor */
es_out_id_t *es;
@ -124,7 +124,7 @@ struct demux_sys_t
unsigned start; /**< Track first sector */
unsigned length; /**< Track total sectors */
unsigned position; /**< Current offset within track sectors */
};
} demux_sys_t;
static int Demux(demux_t *demux)
{
@ -269,7 +269,7 @@ error:
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
struct access_sys_t
typedef struct
{
vcddev_t *vcddev; /* vcd device descriptor */
int *p_sectors; /* Track sectors */
@ -279,7 +279,7 @@ struct access_sys_t
#ifdef HAVE_LIBCDDB
cddb_disc_t *cddb;
#endif
};
} access_sys_t;
#ifdef HAVE_LIBCDDB
static cddb_disc_t *GetCDDBInfo( vlc_object_t *obj, int i_titles, int *p_sectors )

4
modules/access/concat.c
View File

@ -35,7 +35,7 @@ struct access_entry
char mrl[1];
};
struct access_sys_t
typedef struct
{
stream_t *access;
struct access_entry *next;
@ -46,7 +46,7 @@ struct access_sys_t
bool can_control_pace;
uint64_t size;
int64_t caching;
};
} access_sys_t;
static stream_t *GetAccess(stream_t *access)
{

4
modules/access/dc1394.c
View File

@ -54,7 +54,7 @@ vlc_module_begin()
set_callbacks( Open, Close )
vlc_module_end()
struct demux_sys_t
typedef struct
{
/* camera info */
dc1394_t *p_dccontext;
@ -77,7 +77,7 @@ struct demux_sys_t
unsigned int focus;
es_out_id_t *p_es_video;
dc1394video_frame_t *frame;
};
} demux_sys_t;
/*****************************************************************************
* Local prototypes

4
modules/access/directory.c
View File

@ -42,11 +42,11 @@
#include <vlc_fs.h>
#include <vlc_url.h>
struct access_sys_t
typedef struct
{
char *base_uri;
DIR *dir;
};
} access_sys_t;
/*****************************************************************************
* DirInit: Init the directory access with a directory stream

4
modules/access/dshow/access.h
View File

@ -33,6 +33,8 @@
#include <wrl/client.h>
using Microsoft::WRL::ComPtr;
typedef struct demux_sys_t demux_sys_t;
/****************************************************************************
* Crossbar stuff
****************************************************************************/
@ -47,6 +49,8 @@ struct CrossbarRoute
LONG AudioOutputIndex;
};
struct access_sys_t;
void DeleteCrossbarRoutes( access_sys_t * );
HRESULT FindCrossbarRoutes( vlc_object_t *, access_sys_t *,
IPin *, LONG, int = 0 );

4
modules/access/dsm/sd.c
View File

@ -51,11 +51,11 @@ struct entry_item
input_item_t *p_item;
};
struct services_discovery_sys_t
typedef struct
{
netbios_ns *p_ns;
vlc_array_t entry_item_list;
};
} services_discovery_sys_t;
static void entry_item_append( services_discovery_t *p_sd,
netbios_ns_entry *p_entry,

4
modules/access/dtv/access.c
View File

@ -426,12 +426,12 @@ vlc_module_begin ()
#endif
vlc_module_end ()
struct access_sys_t
typedef struct
{
dvb_device_t *dev;
uint8_t signal_poll;
tuner_setup_t pf_setup;
};
} access_sys_t;
static block_t *Read (stream_t *, bool *);
static int Control (stream_t *, int, va_list);

4
modules/access/dv.c
View File

@ -92,7 +92,7 @@ static int AVCPlay( stream_t *, int );
static int AVCPause( stream_t *, int );
static int AVCStop( stream_t *, int );
struct access_sys_t
typedef struct
{
raw1394handle_t p_avc1394;
raw1394handle_t p_raw1394;
@ -108,7 +108,7 @@ struct access_sys_t
event_thread_t *p_ev;
vlc_mutex_t lock;
block_t *p_frame;
};
} access_sys_t;
#define ISOCHRONOUS_QUEUE_LENGTH 1000
#define ISOCHRONOUS_MAX_PACKET_SIZE 4096

4
modules/access/dvb/access.c
View File

@ -47,7 +47,7 @@
#include "dvb.h"
#include "scan.h"
struct access_sys_t
typedef struct
{
demux_handle_t p_demux_handles[MAX_DEMUX];
dvb_sys_t dvb;
@ -55,7 +55,7 @@ struct access_sys_t
/* Scan */
struct scan_t *scan;
bool done;
};
} access_sys_t;
/*****************************************************************************
* Module descriptor

4
modules/access/dvdnav.c
View File

@ -120,7 +120,7 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct demux_sys_t
typedef struct
{
dvdnav_t *dvdnav;
@ -165,7 +165,7 @@ struct demux_sys_t
mtime_t i_pgc_length;
int i_vobu_index;
int i_vobu_flush;
};
} demux_sys_t;
static int Control( demux_t *, int, va_list );
static int Demux( demux_t * );

4
modules/access/dvdread.c
View File

@ -92,7 +92,7 @@ vlc_module_end ()
* Local prototypes
*****************************************************************************/
struct demux_sys_t
typedef struct
{
/* DVDRead state */
dvd_reader_t *p_dvdread;
@ -145,7 +145,7 @@ struct demux_sys_t
/* SPU */
uint32_t clut[16];
};
} demux_sys_t;
static int Control ( demux_t *, int, va_list );
static int Demux ( demux_t * );

4
modules/access/file.c
View File

@ -64,12 +64,12 @@
#include <vlc_url.h>
#include <vlc_interrupt.h>
struct access_sys_t
typedef struct
{
int fd;
bool b_pace_control;
};
} access_sys_t;
#if !defined (_WIN32) && !defined (__OS2__)
static bool IsRemote (int fd)

3
modules/access/ftp.c
View File

@ -107,6 +107,9 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
typedef struct access_sys_t access_sys_t;
static ssize_t Read( stream_t *, void *, size_t );
static int Seek( stream_t *, uint64_t );
static int Control( stream_t *, int, va_list );

4
modules/access/http.c
View File

@ -79,7 +79,7 @@ vlc_module_end ()
* Local prototypes
*****************************************************************************/
struct access_sys_t
typedef struct
{
int fd;
@ -115,7 +115,7 @@ struct access_sys_t
bool b_reconnect;
bool b_has_size;
};
} access_sys_t;
/* */
static ssize_t Read( stream_t *, void *, size_t );

4
modules/access/http/access.c
View File

@ -38,11 +38,11 @@
#include "file.h"
#include "live.h"
struct access_sys_t
typedef struct
{
struct vlc_http_mgr *manager;
struct vlc_http_resource *resource;
};
} access_sys_t;
static block_t *FileRead(stream_t *access, bool *restrict eof)
{

4
modules/access/idummy.c
View File

@ -60,11 +60,11 @@ static int DemuxHold( demux_t *demux )
return 1;
}
struct demux_sys_t
typedef struct
{
mtime_t end;
mtime_t length;
};
} demux_sys_t;
static int DemuxPause( demux_t *demux )
{

4
modules/access/imem-access.c
View File

@ -28,14 +28,14 @@
#include <vlc_access.h>
#include <vlc_plugin.h>
struct access_sys_t
typedef struct
{
void *opaque;
ssize_t (*read_cb)(void *, unsigned char *, size_t);
int (*seek_cb)(void *, uint64_t);
void (*close_cb)(void *);
uint64_t size;
};
} access_sys_t;
static ssize_t Read(stream_t *access, void *buf, size_t len)
{

4
modules/access/imem.c
View File

@ -306,7 +306,7 @@ static int OpenAccess(vlc_object_t *object)
access->pf_read = NULL;
access->pf_block = Block;
access->pf_seek = NULL;
access->p_sys = (access_sys_t*)sys;
access->p_sys = sys;
return VLC_SUCCESS;
}
@ -495,7 +495,7 @@ static int OpenDemux(vlc_object_t *object)
/* */
demux->pf_control = ControlDemux;
demux->pf_demux = Demux;
demux->p_sys = (demux_sys_t*)sys;
demux->p_sys = sys;
return VLC_SUCCESS;
}

4
modules/access/jack.c
View File

@ -83,7 +83,7 @@ vlc_module_end ()
* Local prototypes
*****************************************************************************/
struct demux_sys_t
typedef struct
{
/* Audio properties */
vlc_fourcc_t i_acodec_raw;
@ -106,7 +106,7 @@ struct demux_sys_t
char *psz_ports;
char **pp_jack_port_table;
char i_match_ports;
};
} demux_sys_t;
static int Demux( demux_t * );
static int Control( demux_t *p_demux, int i_query, va_list args );

4
modules/access/linsys/linsys_hdsdi.c
View File

@ -121,7 +121,7 @@ typedef struct hdsdi_audio_t
es_out_id_t *p_es;
} hdsdi_audio_t;
struct demux_sys_t
typedef struct
{
/* video device reader */
int i_vfd;
@ -157,7 +157,7 @@ struct demux_sys_t
pthread_t thread;
int evfd;
};
} demux_sys_t;
static int Control( demux_t *, int, va_list );
static void *Demux( void * );

4
modules/access/linsys/linsys_sdi.c
View File

@ -146,7 +146,7 @@ enum {
STATE_SYNC,
};
struct demux_sys_t
typedef struct
{
/* device reader */
int i_fd;
@ -186,7 +186,7 @@ struct demux_sys_t
es_out_id_t *p_es_video;
sdi_audio_t p_audios[MAX_AUDIOS];
es_out_id_t *p_es_telx;
};
} demux_sys_t;
static int Control( demux_t *, int, va_list );
static int DemuxControl( demux_t *, int, va_list );

4
modules/access/mms/mms.c
View File

@ -80,10 +80,10 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct access_sys_t
typedef struct
{
int i_proto;
};
} access_sys_t;
/*****************************************************************************
* Open:

4
modules/access/mms/mmsh.h
View File

@ -40,7 +40,7 @@ typedef struct
} chunk_t;
#define BUFFER_SIZE 65536
struct access_sys_t
typedef struct
{
int i_proto;
@ -69,6 +69,6 @@ struct access_sys_t
asf_header_t asfh;
guid_t guid;
};
} access_sys_t;
#endif

4
modules/access/mms/mmstu.h
View File

@ -34,7 +34,7 @@
#define MMS_BUFFER_SIZE 100000
struct access_sys_t
typedef struct
{
int i_proto; /* MMS_PROTO_TCP, MMS_PROTO_UDP */
int i_handle_tcp; /* TCP socket for communication with server */
@ -100,6 +100,6 @@ struct access_sys_t
vlc_mutex_t lock_netwrite;
bool b_keep_alive;
vlc_thread_t keep_alive;
};
} access_sys_t;
#endif

4
modules/access/nfs.c
View File

@ -64,7 +64,7 @@ vlc_module_begin()
set_callbacks(Open, Close)
vlc_module_end()
struct access_sys_t
typedef struct
{
struct rpc_context * p_mount; /* used to to get exports mount point */
struct nfs_context * p_nfs;
@ -95,7 +95,7 @@ struct access_sys_t
bool b_done;
} seek;
} res;
};
} access_sys_t;
static bool
nfs_check_status(stream_t *p_access, int i_status, const char *psz_error,

4
modules/access/oss.c
View File

@ -108,7 +108,7 @@ struct buffer_t
size_t length;
};
struct demux_sys_t
typedef struct
{
const char *psz_device; /* OSS device from MRL */
@ -122,7 +122,7 @@ struct demux_sys_t
es_out_id_t *p_es;
int64_t i_next_demux_date; /* Used to handle oss:// as input-slave properly */
};
} demux_sys_t;
static int FindMainDevice( demux_t *p_demux )
{

4
modules/access/pulse.c
View File

@ -50,7 +50,7 @@ vlc_module_begin ()
set_callbacks (Open, Close)
vlc_module_end ()
struct demux_sys_t
typedef struct
{
pa_stream *stream; /**< PulseAudio playback stream object */
pa_context *context; /**< PulseAudio connection context */
@ -60,7 +60,7 @@ struct demux_sys_t
bool discontinuity; /**< The next block will not follow the last one */
unsigned framesize; /**< Byte size of a sample */
mtime_t caching; /**< Caching value */
};
} demux_sys_t;
/* Stream helpers */
static void stream_state_cb(pa_stream *s, void *userdata)

4
modules/access/qtsound.m
View File

@ -220,12 +220,12 @@ vlc_module_end ()
* Struct
*****************************************************************************/
struct demux_sys_t {
typedef struct demux_sys_t {
QTCaptureSession * session;
QTCaptureDevice * audiodevice;
VLCDecompressedAudioOutput * audiooutput;
es_out_id_t *p_es_audio;
};
} demux_sys_t;
/*****************************************************************************
* Open: initialize interface

4
modules/access/rdp.c
View File

@ -103,7 +103,7 @@ vlc_module_end()
#define RDP_MAX_FD 32
struct demux_sys_t
typedef struct
{
vlc_thread_t thread;
freerdp *p_instance;
@ -121,7 +121,7 @@ struct demux_sys_t
int i_port;
/* cancelability */
int i_cancel_state;
};
} demux_sys_t;
/* context */

4
modules/access/rtp/rtp.h
View File

@ -62,7 +62,7 @@ void *rtp_dgram_thread (void *data);
void *rtp_stream_thread (void *data);
/* Global data */
struct demux_sys_t
typedef struct
{
rtp_session_t *session;
struct vlc_demux_chained_t *chained_demux;
@ -79,5 +79,5 @@ struct demux_sys_t
uint8_t max_src; /**< Max simultaneous RTP sources */
bool thread_ready;
bool autodetect; /**< Payload type autodetection pending */
};
} demux_sys_t;

4
modules/access/rtsp/access.c
View File

@ -62,14 +62,14 @@ static block_t *BlockRead( stream_t *, bool * );
static int Seek( stream_t *, uint64_t );
static int Control( stream_t *, int, va_list );
struct access_sys_t
typedef struct
{
rtsp_client_t *p_rtsp;
int fd;
block_t *p_header;
};
} access_sys_t;
/*****************************************************************************
* Network wrappers

4
modules/access/samba.c
View File

@ -38,12 +38,12 @@
#include "smb_common.h"
struct access_sys_t
typedef struct
{
int i_smb;
uint64_t size;
vlc_url_t url;
};
} access_sys_t;
/* Build an SMB URI
* smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */

5
modules/access/satip.c
View File

@ -92,7 +92,8 @@ enum rtsp_result {
};
#define UDP_ADDRESS_LEN 16
struct access_sys_t {
typedef struct
{
char *content_base;
char *control;
char session_id[64];
@ -115,7 +116,7 @@ struct access_sys_t {
uint16_t last_seq_nr;
bool woken;
};
} access_sys_t;
static void parse_session(char *request_line, char *session, unsigned max, int *timeout) {
char *state;

4
modules/access/screen/screen.h
View File

@ -39,7 +39,7 @@
typedef struct screen_data_t screen_data_t;
struct demux_sys_t
typedef struct
{
es_format_t fmt;
es_out_id_t *es;
@ -73,7 +73,7 @@ struct demux_sys_t
#endif
screen_data_t *p_data;
};
} demux_sys_t;
int screen_InitCapture ( demux_t * );
int screen_CloseCapture( demux_t * );

4
modules/access/screen/wayland.c
View File

@ -41,7 +41,7 @@
#include <vlc_fs.h>
#include <vlc_plugin.h>
struct demux_sys_t
typedef struct
{
struct wl_display *display;
struct wl_output *output;
@ -62,7 +62,7 @@ struct demux_sys_t
mtime_t start;
vlc_thread_t thread;
};
} demux_sys_t;
static bool DisplayError(vlc_object_t *obj, struct wl_display *display)
{

4
modules/access/screen/xcb.c
View File

@ -101,7 +101,7 @@ static int Control (demux_t *, int, va_list);
static es_out_id_t *InitES (demux_t *, uint_fast16_t, uint_fast16_t,
uint_fast8_t, uint8_t *);
struct demux_sys_t
typedef struct
{
/* All owned by timer thread while timer is armed: */
xcb_connection_t *conn; /**< XCB connection */
@ -118,7 +118,7 @@ struct demux_sys_t
uint16_t cur_w, cur_h; /**< Actual capture pixel dimensions */
/* Timer does not use this, only input thread: */
vlc_timer_t timer;
};
} demux_sys_t;
/** Checks MIT-SHM shared memory support */
static bool CheckSHM (xcb_connection_t *conn)

4
modules/access/sftp.c
View File

@ -82,7 +82,7 @@ static int Control( stream_t *, int, va_list );
static int DirRead( stream_t *, input_item_node_t * );
struct access_sys_t
typedef struct
{
int i_socket;
LIBSSH2_SESSION* ssh_session;
@ -90,7 +90,7 @@ struct access_sys_t
LIBSSH2_SFTP_HANDLE* file;
uint64_t filesize;
char *psz_base_url;
};
} access_sys_t;
static int AuthKeyAgent( stream_t *p_access, const char *psz_username )
{

2
modules/access/shm.c
View File

@ -110,6 +110,8 @@ vlc_module_begin ()
add_shortcut ("shm")
vlc_module_end ()
typedef struct demux_sys_t demux_sys_t;
static int Control (demux_t *, int, va_list);
static void DemuxFile (void *);
static void CloseFile (demux_sys_t *);

4
modules/access/srt.c
View File

@ -56,7 +56,7 @@ static const char *const srt_key_length_names[] = {
N_("16 bytes"), N_("24 bytes"), N_("32 bytes"),
};
struct stream_sys_t
typedef struct
{
SRTSOCKET sock;
int i_poll_id;
@ -64,7 +64,7 @@ struct stream_sys_t
bool b_interrupted;
char *psz_host;
int i_port;
};
} stream_sys_t;
static void srt_wait_interrupted(void *p_data)
{

4
modules/access/timecode.c
View File

@ -51,12 +51,12 @@ vlc_module_begin ()
change_safe ()
vlc_module_end ()
struct demux_sys_t
typedef struct
{
es_out_id_t *es;
date_t date;
mtime_t next_time;
};
} demux_sys_t;
static int DemuxOnce (demux_t *demux, bool master)
{

4
modules/access/udp.c
View File

@ -76,12 +76,12 @@ vlc_module_begin ()
set_callbacks( Open, Close )
vlc_module_end ()
struct access_sys_t
typedef struct
{
int fd;
int timeout;
size_t mtu;
};
} access_sys_t;
/*****************************************************************************
* Local prototypes

4
modules/access/unc.c
View File

@ -43,12 +43,12 @@
#include "smb_common.h"
struct access_sys_t
typedef struct
{
int i_smb;
uint64_t size;
vlc_url_t url;
};
} access_sys_t;
static void Win32AddConnection(stream_t *access, const char *server,
const char *share, const char *user,

4
modules/access/v4l2/access.c
View File

@ -37,7 +37,7 @@
#include "v4l2.h"
struct access_sys_t
typedef struct
{
int fd;
uint32_t block_flags;
@ -48,7 +48,7 @@ struct access_sys_t
};
struct buffer_t *bufv;
vlc_v4l2_ctrl_t *controls;
};
} access_sys_t;
static block_t *MMapBlock (stream_t *, bool *);
static block_t *ReadBlock (stream_t *, bool *);

4
modules/access/v4l2/demux.c
View File

@ -42,7 +42,7 @@
#include "v4l2.h"
struct demux_sys_t
typedef struct
{
int fd;
vlc_thread_t thread;
@ -62,7 +62,7 @@ struct demux_sys_t
#ifdef ZVBI_COMPILED
vlc_v4l2_vbi_t *vbi;
#endif
};
} demux_sys_t;
static void *UserPtrThread (void *);
static void *MmapThread (void *);

4
modules/access/v4l2/radio.c
View File

@ -30,12 +30,12 @@
#include "v4l2.h"
struct demux_sys_t
typedef struct
{
int fd;
vlc_v4l2_ctrl_t *controls;
mtime_t start;
};
} demux_sys_t;
static int RadioControl (demux_t *demux, int query, va_list args)
{

4
modules/access/vcd/vcd.c
View File

@ -63,7 +63,7 @@ vlc_module_end ()
#define VCD_BLOCKS_ONCE 20
#define VCD_DATA_ONCE (VCD_BLOCKS_ONCE * VCD_DATA_SIZE)
struct access_sys_t
typedef struct
{
vcddev_t *vcddev; /* vcd device descriptor */
uint64_t offset;
@ -80,7 +80,7 @@ struct access_sys_t
int i_sector; /* Current Sector */
int *p_sectors; /* Track sectors */
};
} access_sys_t;
static block_t *Block( stream_t *, bool * );
static int Seek( stream_t *, uint64_t );

4
modules/access/vdr.c
View File

@ -106,7 +106,7 @@ vlc_module_end ()
TYPEDEF_ARRAY( uint64_t, size_array_t );
struct access_sys_t
typedef struct
{
/* file sizes of all parts */
size_array_t file_sizes;
@ -128,7 +128,7 @@ struct access_sys_t
/* file format: true=TS, false=PES */
bool b_ts_format;
};
} access_sys_t;
#define CURRENT_FILE_SIZE ARRAY_VAL(p_sys->file_sizes, p_sys->i_current_file)
#define FILE_SIZE(pos) ARRAY_VAL(p_sys->file_sizes, pos)

4
modules/access/vnc.c
View File

@ -111,7 +111,7 @@ vlc_module_begin()
set_callbacks( Open, Close )
vlc_module_end()
struct demux_sys_t
typedef struct
{
vlc_thread_t thread;
int i_cancel_state;
@ -125,7 +125,7 @@ struct demux_sys_t
mtime_t i_starttime;
es_out_id_t *es;
};
} demux_sys_t;
static void *DemuxThread( void *p_data );

4
modules/access/wasapi.c
View File

@ -267,7 +267,7 @@ static es_out_id_t *CreateES(demux_t *demux, IAudioClient *client, bool loop,
return es_out_Add(demux->out, &fmt);
}
struct demux_sys_t
typedef struct
{
IAudioClient *client;
es_out_id_t *es;
@ -281,7 +281,7 @@ struct demux_sys_t
HANDLE thread;
HANDLE ready;
};
};
} demux_sys_t;
static unsigned __stdcall Thread(void *data)
{

4
modules/access_output/http.c
View File

@ -91,7 +91,7 @@ static const char *const ppsz_sout_options[] = {
static ssize_t Write( sout_access_out_t *, block_t * );
static int Control( sout_access_out_t *, int, va_list );
struct sout_access_out_sys_t
typedef struct
{
/* host */
httpd_host_t *p_httpd_host;
@ -106,7 +106,7 @@ struct sout_access_out_sys_t
bool b_header_complete;
bool b_metacube;
bool b_has_keyframes;
};
} sout_access_out_sys_t;
/* Definitions for the Metacube2 protocol, used to communicate with Cubemap. */

4
modules/access_output/livehttp.c
View File

@ -173,7 +173,7 @@ typedef struct output_segment
uint8_t aes_ivs[16];
} output_segment_t;
struct sout_access_out_sys_t
typedef struct
{
char *psz_cursegPath;
char *psz_indexPath;
@ -205,7 +205,7 @@ struct sout_access_out_sys_t
uint8_t stuffing_bytes[16];
ssize_t stuffing_size;
vlc_array_t segments_t;
};
} sout_access_out_sys_t;
static int LoadCryptFile( sout_access_out_t *p_access);
static int CryptSetup( sout_access_out_t *p_access, char *keyfile );

4
modules/access_output/shout.c
View File

@ -152,10 +152,10 @@ static const char *const ppsz_sout_options[] = {
static ssize_t Write( sout_access_out_t *, block_t * );
static int Control( sout_access_out_t *, int, va_list );
struct sout_access_out_sys_t
typedef struct
{
shout_t *p_shout;
};
} sout_access_out_sys_t;
/*****************************************************************************
* Open: open the shout connection

4
modules/access_output/srt.c
View File

@ -57,13 +57,13 @@ static const char *const srt_key_length_names[] = {
N_("16 bytes"), N_("24 bytes"), N_("32 bytes"),
};
struct sout_access_out_sys_t
typedef struct
{
SRTSOCKET sock;
int i_poll_id;
bool b_interrupted;
vlc_mutex_t lock;
};
} sout_access_out_sys_t;
static void srt_wait_interrupted(void *p_data)
{

4
modules/access_output/udp.c
View File

@ -109,7 +109,7 @@ static int Control( sout_access_out_t *, int, va_list );
static void* ThreadWrite( void * );
static block_t *NewUDPPacket( sout_access_out_t *, mtime_t );
struct sout_access_out_sys_t
typedef struct
{
mtime_t i_caching;
int i_handle;
@ -121,7 +121,7 @@ struct sout_access_out_sys_t
block_t *p_buffer;
vlc_thread_t thread;
};
} sout_access_out_sys_t;
#define DEFAULT_PORT 1234

4
modules/audio_filter/audiobargraph_a.c
View File

@ -92,7 +92,7 @@ typedef struct ValueDate_t {
struct ValueDate_t* next;
} ValueDate_t;
struct filter_sys_t
typedef struct
{
bool bargraph;
int bargraph_repetition;
@ -105,7 +105,7 @@ struct filter_sys_t
ValueDate_t* last;
int started;
mtime_t lastAlarm;
};
} filter_sys_t;
/*****************************************************************************
* Open: open the visualizer

4
modules/audio_filter/channel_mixer/dolby.c
View File

@ -58,7 +58,7 @@ vlc_module_end ()
/*****************************************************************************
* Internal data structures
*****************************************************************************/
struct filter_sys_t
typedef struct
{
int i_left;
int i_center;
@ -66,7 +66,7 @@ struct filter_sys_t
int i_rear_left;
int i_rear_center;
int i_rear_right;
};
} filter_sys_t;
/*****************************************************************************
* Create: allocate headphone downmixer

10
modules/audio_filter/channel_mixer/headphone.c
View File

@ -103,13 +103,13 @@ struct atomic_operation_t
double d_amplitude_factor;
};
struct filter_sys_t
typedef struct
{
size_t i_overflow_buffer_size;/* in bytes */
float * p_overflow_buffer;
unsigned int i_nb_atomic_operations;
struct atomic_operation_t * p_atomic_operations;
};
} filter_sys_t;
/*****************************************************************************
* Init: initialize internal data structures
@ -129,7 +129,7 @@ struct filter_sys_t
*
* x-axis
* */
static void ComputeChannelOperations( struct filter_sys_t * p_data
static void ComputeChannelOperations( filter_sys_t * p_data
, unsigned int i_rate, unsigned int i_next_atomic_operation
, int i_source_channel_offset, double d_x, double d_z
, double d_compensation_length, double d_channel_amplitude_factor )
@ -186,7 +186,7 @@ static void ComputeChannelOperations( struct filter_sys_t * p_data
}
}
static int Init( vlc_object_t *p_this, struct filter_sys_t * p_data
static int Init( vlc_object_t *p_this, filter_sys_t * p_data
, unsigned int i_nb_channels, uint32_t i_physical_channels
, unsigned int i_rate )
{
@ -451,7 +451,7 @@ static int OpenFilter( vlc_object_t *p_this )
}
/* Allocate the memory needed to store the module's structure */
p_sys = p_filter->p_sys = malloc( sizeof(struct filter_sys_t) );
p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
if( p_sys == NULL )
return VLC_ENOMEM;
p_sys->i_overflow_buffer_size = 0;

8
modules/audio_filter/channel_mixer/mono.c
View File

@ -61,7 +61,7 @@ struct atomic_operation_t
double d_amplitude_factor;
};
struct filter_sys_t
typedef struct
{
bool b_downmix;
@ -73,7 +73,7 @@ struct filter_sys_t
uint8_t * p_overflow_buffer;
unsigned int i_nb_atomic_operations;
struct atomic_operation_t * p_atomic_operations;
};
} filter_sys_t;
#define MONO_DOWNMIX_TEXT N_("Use downmix algorithm")
#define MONO_DOWNMIX_LONGTEXT N_("This option selects a stereo to mono " \
@ -135,7 +135,7 @@ vlc_module_end ()
*
* x-axis
* */
static void ComputeChannelOperations( struct filter_sys_t * p_data,
static void ComputeChannelOperations( filter_sys_t * p_data,
unsigned int i_rate, unsigned int i_next_atomic_operation,
int i_source_channel_offset, double d_x, double d_z,
double d_compensation_length, double d_channel_amplitude_factor )
@ -192,7 +192,7 @@ static void ComputeChannelOperations( struct filter_sys_t * p_data,
}
}
static int Init( vlc_object_t *p_this, struct filter_sys_t * p_data,
static int Init( vlc_object_t *p_this, filter_sys_t * p_data,
unsigned int i_nb_channels, uint32_t i_physical_channels,
unsigned int i_rate )
{

4
modules/audio_filter/channel_mixer/remap.c
View File

@ -104,13 +104,13 @@ static block_t *Remap( filter_t *, block_t * );
typedef void (*remap_fun_t)( filter_t *, const void *, void *,
int, unsigned, unsigned);
struct filter_sys_t
typedef struct
{
remap_fun_t pf_remap;
int nb_in_ch[AOUT_CHAN_MAX];
int8_t map_ch[AOUT_CHAN_MAX];
bool b_normalize;
};
} filter_sys_t;
static const uint32_t valid_channels[] = {
/* list taken from aout_FormatPrintChannels */

4
modules/audio_filter/channel_mixer/spatialaudio.cpp
View File

@ -380,7 +380,7 @@ static int OpenBinauralizer(vlc_object_t *p_this)
aout_FormatPrepare(infmt);
aout_FormatPrepare(outfmt);
p_filter->p_sys = reinterpret_cast<filter_sys_t*>(p_sys);
p_filter->p_sys = p_sys;
p_filter->pf_audio_filter = Mix;
p_filter->pf_flush = Flush;
p_filter->pf_change_viewpoint = ChangeViewpoint;
@ -513,7 +513,7 @@ static int Open(vlc_object_t *p_this)
return VLC_EGENERIC;
}
p_filter->p_sys = reinterpret_cast<filter_sys_t*>(p_sys);
p_filter->p_sys = p_sys;
p_filter->pf_audio_filter = Mix;
p_filter->pf_flush = Flush;
p_filter->pf_change_viewpoint = ChangeViewpoint;

4
modules/audio_filter/channel_mixer/trivial.c
View File

@ -46,10 +46,10 @@ vlc_module_begin ()
set_callbacks( Create, Destroy )
vlc_module_end ()
struct filter_sys_t
typedef struct
{
int channel_map[AOUT_CHAN_MAX];
};
} filter_sys_t;
/**
* Trivially upmixes

2
modules/audio_filter/chorus_flanger.c
View File

@ -38,6 +38,8 @@
* Local prototypes
*****************************************************************************/
typedef struct filter_sys_t filter_sys_t;
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static block_t *DoWork( filter_t *, block_t * );

4
modules/audio_filter/compressor.c
View File

@ -80,7 +80,7 @@ typedef struct
} lookahead;
struct filter_sys_t
typedef struct
{
float f_amp;
float pf_as[A_TBL];
@ -106,7 +106,7 @@ struct filter_sys_t
float f_ratio;
float f_knee;
float f_makeup_gain;
};
} filter_sys_t;
typedef union
{

4
modules/audio_filter/converter/tospdif.c
View File

@ -51,7 +51,7 @@ vlc_module_begin ()
set_callbacks( Open, Close )
vlc_module_end ()
struct filter_sys_t
typedef struct
{
block_t *p_out_buf;
size_t i_out_offset;
@ -71,7 +71,7 @@ struct filter_sys_t
bool b_skip;
} dtshd;
};
};
} filter_sys_t;
#define SPDIF_HEADER_SIZE 8

4
modules/audio_filter/equalizer.c
View File

@ -101,7 +101,7 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct filter_sys_t
typedef struct
{
/* Filter static config */
int i_band;
@ -123,7 +123,7 @@ struct filter_sys_t
float y2[32][128][2];
vlc_mutex_t lock;
};
} filter_sys_t;
static block_t *DoWork( filter_t *, block_t * );

4
modules/audio_filter/gain.c
View File

@ -44,12 +44,12 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static block_t *Process ( filter_t *, block_t * );
struct filter_sys_t
typedef struct
{
audio_volume_t volume;
float f_gain;
module_t *module;
};
} filter_sys_t;
/*****************************************************************************
* Module descriptor

6
modules/audio_filter/normvol.c
View File

@ -52,12 +52,12 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static block_t *DoWork( filter_t *, block_t * );
struct filter_sys_t
typedef struct
{
int i_nb;
float *p_last;
float f_max;
};
} filter_sys_t;
/*****************************************************************************
* Module descriptor
@ -140,7 +140,7 @@ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
float *p_out = (float*)p_in_buf->p_buffer;
float *p_in = (float*)p_in_buf->p_buffer;
struct filter_sys_t *p_sys = p_filter->p_sys;
filter_sys_t *p_sys = p_filter->p_sys;
pf_sum = calloc( i_channels, sizeof(float) );
if( !pf_sum )

4
modules/audio_filter/param_eq.c
View File

@ -83,7 +83,7 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct filter_sys_t
typedef struct
{
/* Filter static config */
float f_lowf, f_lowgain;
@ -95,7 +95,7 @@ struct filter_sys_t
float coeffs[5*5];
/* State */
float *p_state;
};
} filter_sys_t;

4
modules/audio_filter/resampler/bandlimited.c
View File

@ -66,7 +66,7 @@ static void ResampleFloat( filter_t *p_filter,
/*****************************************************************************
* Local structures
*****************************************************************************/
struct filter_sys_t
typedef struct
{
int32_t *p_buf; /* this filter introduces a delay */
size_t i_buf_size;
@ -78,7 +78,7 @@ struct filter_sys_t
bool b_first;
date_t end_date;
};
} filter_sys_t;
/*****************************************************************************
* Module descriptor

6
modules/audio_filter/resampler/soxr.c
View File

@ -80,7 +80,7 @@ vlc_module_begin ()
add_shortcut( "soxr" )
vlc_module_end ()
struct filter_sys_t
typedef struct
{
soxr_t soxr;
soxr_t vr_soxr;
@ -88,7 +88,7 @@ struct filter_sys_t
double f_fixed_ratio;
size_t i_last_olen;
mtime_t i_last_pts;
};
} filter_sys_t;
static block_t *Resample( filter_t *, block_t * );
static block_t *Drain( filter_t * );
@ -131,7 +131,7 @@ Open( vlc_object_t *p_obj, bool b_change_ratio )
|| !SoXR_GetFormat( p_filter->fmt_out.audio.i_format, &i_otype ) )
return VLC_EGENERIC;
filter_sys_t *p_sys = calloc( 1, sizeof( struct filter_sys_t ) );
filter_sys_t *p_sys = calloc( 1, sizeof( filter_sys_t ) );
if( unlikely( p_sys == NULL ) )
return VLC_ENOMEM;

2
modules/audio_filter/resampler/speex.c
View File

@ -92,7 +92,7 @@ static int OpenResampler (vlc_object_t *obj)
return VLC_ENOMEM;
}
filter->p_sys = (filter_sys_t *)st;
filter->p_sys = st;
filter->pf_audio_filter = Resample;
return VLC_SUCCESS;
}

2
modules/audio_filter/resampler/src.c
View File

@ -103,7 +103,7 @@ static int OpenResampler (vlc_object_t *obj)
return VLC_EGENERIC;
}
filter->p_sys = (filter_sys_t *)s;
filter->p_sys = s;
filter->pf_audio_filter = Resample;
return VLC_SUCCESS;
}

4
modules/audio_filter/scaletempo.c
View File

@ -95,7 +95,7 @@ vlc_module_end ()
* frame: a single set of samples, one for each channel
* VLC uses these terms differently
*/
struct filter_sys_t
typedef struct
{
/* Filter static config */
double scale;
@ -135,7 +135,7 @@ struct filter_sys_t
filter_t * resampler;
vlc_atomic_float rate_shift;
#endif
};
} filter_sys_t;
/*****************************************************************************
* best_overlap_offset: calculate best offset for overlap

4
modules/audio_filter/stereo_widen.c
View File

@ -39,7 +39,7 @@ static block_t *Filter ( filter_t *, block_t * );
static int paramCallback( vlc_object_t *, char const *, vlc_value_t ,
vlc_value_t , void * );
struct filter_sys_t
typedef struct
{
float *pf_ringbuf; /* circular buffer to store samples */
float *pf_write; /* where to write current sample */
@ -48,7 +48,7 @@ struct filter_sys_t
float f_feedback;
float f_crossfeed;
float f_dry_mix;
};
} filter_sys_t;
#define HELP_TEXT N_("This filter enhances the stereo effect by "\
"suppressing mono (signal common to both channels) "\

4
modules/audio_output/alsa.c
View File

@ -40,7 +40,7 @@
#include <alsa/version.h>
/** Private data for an ALSA PCM playback stream */
struct aout_sys_t
typedef struct
{
snd_pcm_t *pcm;
unsigned rate; /**< Sample rate */
@ -51,7 +51,7 @@ struct aout_sys_t
bool soft_mute;
float soft_gain;
char *device;
};
} aout_sys_t;
enum {
PASSTHROUGH_NONE,

4
modules/audio_output/amem.c
View File

@ -52,7 +52,7 @@ vlc_module_begin ()
vlc_module_end ()
struct aout_sys_t
typedef struct
{
void *opaque;
int (*setup) (void **, char *, unsigned *, unsigned *);
@ -78,7 +78,7 @@ struct aout_sys_t
float volume;
bool mute;
bool ready;
};
} aout_sys_t;
static void Play (audio_output_t *aout, block_t *block)
{

5
modules/audio_output/audiotrack.c
View File

@ -79,7 +79,8 @@ static const struct {
{ NULL, NULL, AT_DEV_DEFAULT },
};
struct aout_sys_t {
typedef struct
{
/* sw gain */
float soft_gain;
bool soft_mute;
@ -166,7 +167,7 @@ struct aout_sys_t {
} bytebuffer;
} u;
} circular;
};
} aout_sys_t;
/* Soft volume helper */
#include "audio_output/volume.h"

4
modules/audio_output/audiounit_ios.m
View File

@ -77,7 +77,7 @@ static const struct {
* This structure is part of the audio output thread descriptor.
* It describes the CoreAudio specific properties of an output thread.
*****************************************************************************/
struct aout_sys_t
typedef struct aout_sys_t
{
struct aout_sys_common c;
@ -93,7 +93,7 @@ struct aout_sys_t
/* sw gain */
float soft_gain;
bool soft_mute;
};
} aout_sys_t;
/* Soft volume helper */
#include "audio_output/volume.h"

4
modules/audio_output/auhal.c
View File

@ -74,7 +74,7 @@ vlc_module_end ()
* This structure is part of the audio output thread descriptor.
* It describes the CoreAudio specific properties of an output thread.
*****************************************************************************/
struct aout_sys_t
typedef struct
{
struct aout_sys_common c;
@ -121,7 +121,7 @@ struct aout_sys_t
bool b_mute;
bool b_ignore_streams_changed_callback;
};
} aout_sys_t;
#pragma mark -
#pragma mark helpers

4
modules/audio_output/directsound.c
View File

@ -127,7 +127,7 @@ typedef struct aout_stream_sys
* This structure is part of the audio output thread descriptor.
* It describes the direct sound specific properties of an audio device.
*/
struct aout_sys_t
typedef struct
{
aout_stream_sys_t s;
struct
@ -136,7 +136,7 @@ struct aout_sys_t
LONG mb;
bool mute;
} volume;
};
} aout_sys_t;
static HRESULT Flush( aout_stream_sys_t *sys, bool drain);
static HRESULT TimeGet( aout_stream_sys_t *sys, mtime_t *delay )

4
modules/audio_output/file.c
View File

@ -47,13 +47,13 @@
* This structure is part of the audio output thread descriptor.
* It describes the direct sound specific properties of an audio device.
*****************************************************************************/
struct aout_sys_t
typedef struct
{
FILE * p_file;
bool b_add_wav_header;
WAVEHEADER waveh; /* Wave header of the output file */
};
} aout_sys_t;
#define CHANNELS_MAX 6
static const int pi_channels_maps[CHANNELS_MAX+1] =

18
modules/audio_output/jack.c
View File

@ -51,7 +51,7 @@ typedef jack_default_audio_sample_t jack_sample_t;
* This structure is part of the audio output thread descriptor.
* It describes some JACK specific variables.
*****************************************************************************/
struct aout_sys_t
typedef struct
{
jack_ringbuffer_t *p_jack_ringbuffer;
jack_client_t *p_jack_client;
@ -63,7 +63,7 @@ struct aout_sys_t
float soft_gain;
bool soft_mute;
mtime_t paused; /**< Time when (last) paused */
};
} aout_sys_t;
/*****************************************************************************
* Local prototypes
@ -116,7 +116,7 @@ vlc_module_end ()
static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
{
char *psz_name;
struct aout_sys_t *p_sys = p_aout->sys;
aout_sys_t *p_sys = p_aout->sys;
int status = VLC_SUCCESS;
unsigned int i;
int i_error;
@ -285,7 +285,7 @@ error_out:
static void Play (audio_output_t * p_aout, block_t * p_block)
{
struct aout_sys_t *p_sys = p_aout->sys;
aout_sys_t *p_sys = p_aout->sys;
jack_ringbuffer_t *rb = p_sys->p_jack_ringbuffer;
const size_t bytes_per_frame = p_sys->i_channels * sizeof(jack_sample_t);
@ -330,7 +330,7 @@ static void Pause(audio_output_t *aout, bool paused, mtime_t date)
static void Flush(audio_output_t *p_aout, bool wait)
{
struct aout_sys_t * p_sys = p_aout->sys;
aout_sys_t * p_sys = p_aout->sys;
jack_ringbuffer_t *rb = p_sys->p_jack_ringbuffer;
/* Sleep if wait was requested */
@ -347,7 +347,7 @@ static void Flush(audio_output_t *p_aout, bool wait)
static int TimeGet(audio_output_t *p_aout, mtime_t *delay)
{
struct aout_sys_t * p_sys = p_aout->sys;
aout_sys_t * p_sys = p_aout->sys;
jack_ringbuffer_t *rb = p_sys->p_jack_ringbuffer;
const size_t bytes_per_frame = p_sys->i_channels * sizeof(jack_sample_t);
@ -367,7 +367,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
size_t bytes_read = 0;
size_t frames_read;
audio_output_t *p_aout = (audio_output_t*) p_arg;
struct aout_sys_t *p_sys = p_aout->sys;
aout_sys_t *p_sys = p_aout->sys;
/* Get the next audio data buffer unless paused */
@ -414,7 +414,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
static int GraphChange( void *p_arg )
{
audio_output_t *p_aout = (audio_output_t*) p_arg;
struct aout_sys_t *p_sys = p_aout->sys;
aout_sys_t *p_sys = p_aout->sys;
unsigned int i;
jack_latency_range_t port_latency;
@ -439,7 +439,7 @@ static int GraphChange( void *p_arg )
static void Stop( audio_output_t *p_aout )
{
int i_error;
struct aout_sys_t *p_sys = p_aout->sys;
aout_sys_t *p_sys = p_aout->sys;
i_error = jack_deactivate( p_sys->p_jack_client );
if( i_error )

4
modules/audio_output/kai.c
View File

@ -58,14 +58,14 @@ typedef struct audio_buffer_t audio_buffer_t;
* This structure is part of the audio output thread descriptor.
* It describes the specific properties of an audio device.
*****************************************************************************/
struct aout_sys_t
typedef struct
{
audio_buffer_t *buffer;
HKAI hkai;
float soft_gain;
bool soft_mute;
audio_sample_format_t format;
};
} aout_sys_t;
/*****************************************************************************
* Local prototypes

4
modules/audio_output/mmdevice.c
View File

@ -74,7 +74,7 @@ static void LeaveMTA(void)
static wchar_t default_device[1] = L"";
static char default_device_b[1] = "";
struct aout_sys_t
typedef struct
{
aout_stream_t *stream; /**< Underlying audio output stream */
module_t *module;
@ -99,7 +99,7 @@ struct aout_sys_t
CONDITION_VARIABLE work;
CONDITION_VARIABLE ready;
vlc_thread_t thread; /**< Thread for audio session control */
};
} aout_sys_t;
/* NOTE: The Core Audio API documentation totally fails to specify the thread
* safety (or lack thereof) of the interfaces. This code takes the most

4
modules/audio_output/opensles_android.c
View File

@ -80,7 +80,7 @@ typedef SLresult (*slCreateEngine_t)(
/*****************************************************************************
*
*****************************************************************************/
struct aout_sys_t
typedef struct
{
/* OpenSL objects */
SLObjectItf engineObject;
@ -118,7 +118,7 @@ struct aout_sys_t
block_t *p_buffer_chain;
block_t **pp_buffer_last;
size_t samples;
};
} aout_sys_t;
/*****************************************************************************
* Local prototypes.

4
modules/audio_output/oss.c
View File

@ -51,7 +51,7 @@
#define A52_FRAME_NB 1536
struct aout_sys_t
typedef struct
{
int fd;
audio_sample_format_t format;
@ -59,7 +59,7 @@ struct aout_sys_t
bool soft_mute;
float soft_gain;
char *device;
};
} aout_sys_t;
#include "volume.h"

4
modules/audio_output/pulse.c
View File

@ -61,7 +61,7 @@ struct sink
char name[1];
};
struct aout_sys_t
typedef struct
{
pa_stream *stream; /**< PulseAudio playback stream object */
pa_context *context; /**< PulseAudio connection context */
@ -75,7 +75,7 @@ struct aout_sys_t
char *sink_force; /**< Forced sink name (stream must be NULL) */
struct sink *sinks; /**< Locally-cached list of sinks */
};
} aout_sys_t;
static void VolumeReport(audio_output_t *aout)
{

4
modules/audio_output/sndio.c
View File

@ -51,7 +51,7 @@ static int MuteSet (audio_output_t *, bool);
static void VolumeChanged (void *, unsigned);
static void PositionChanged (void *, int);
struct aout_sys_t
typedef struct
{
struct sio_hdl *hdl;
int started;
@ -59,7 +59,7 @@ struct aout_sys_t
unsigned rate;
unsigned volume;
bool mute;
};
} aout_sys_t;
/** Initializes an sndio playback stream */
static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)

5
modules/audio_output/tizen_audio.c
View File

@ -39,7 +39,8 @@
static int Open( vlc_object_t * );
static void Close( vlc_object_t * );
struct aout_sys_t {
typedef struct
{
/* sw gain */
float soft_gain;
bool soft_mute;
@ -55,7 +56,7 @@ struct aout_sys_t {
int (*pf_audio_out_drain)( audio_out_h output );
int (*pf_audio_out_flush)( audio_out_h output );
};
} aout_sys_t;
/* Soft volume helper */
#include "audio_output/volume.h"

3
modules/audio_output/waveout.c
View File

@ -54,6 +54,9 @@ static void Play ( audio_output_t *, block_t * );
/*****************************************************************************
* notification_thread_t: waveOut event thread
*****************************************************************************/
typedef struct aout_sys_t aout_sys_t;
struct lkwavehdr
{
WAVEHDR hdr;

4
modules/audio_output/winstore.c
View File

@ -50,12 +50,12 @@ static void LeaveMTA(void)
CoUninitialize();
}
struct aout_sys_t
typedef struct
{
aout_stream_t *stream; /**< Underlying audio output stream */
module_t *module;
IAudioClient *client;
};
} aout_sys_t;
static int vlc_FromHR(audio_output_t *aout, HRESULT hr)
{

4
modules/codec/a52.c
View File

@ -55,7 +55,7 @@
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
struct decoder_sys_t
typedef struct
{
a52_state_t *p_liba52; /* liba52 internal structure */
bool b_dynrng; /* see below */
@ -65,7 +65,7 @@ struct decoder_sys_t
uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
bool b_synced;
};
} decoder_sys_t;
#define DYNRNG_TEXT N_("A/52 dynamic range compression")
#define DYNRNG_LONGTEXT N_( \

4
modules/codec/adpcm.c
View File

@ -65,7 +65,7 @@ enum adpcm_codec_e
ADPCM_EA
};
struct decoder_sys_t
typedef struct
{
enum adpcm_codec_e codec;
@ -74,7 +74,7 @@ struct decoder_sys_t
date_t end_date;
int16_t *prev;
};
} decoder_sys_t;
static void DecodeAdpcmMs ( decoder_t *, int16_t *, uint8_t * );
static void DecodeAdpcmImaWav( decoder_t *, int16_t *, uint8_t * );

4
modules/codec/aes3.c
View File

@ -58,13 +58,13 @@ vlc_module_end ()
/*****************************************************************************
* decoder_sys_t : aes3 decoder descriptor
*****************************************************************************/
struct decoder_sys_t
typedef struct
{
/*
* Output properties
*/
date_t end_date;
};
} decoder_sys_t;
#define AES3_HEADER_LEN 4

Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save