From 8d26c193fb42d08602ac93ece039d4718d029adc Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 27 Mar 2015 12:40:23 +0100 Subject: [PATCH] avdevice: Apply a more consistent file naming scheme --- libavdevice/Makefile | 20 +++++++++----------- libavdevice/{alsa-audio-common.c => alsa.c} | 2 +- libavdevice/{alsa-audio.h => alsa.h} | 6 +++--- libavdevice/{alsa-audio-dec.c => alsa_dec.c} | 2 +- libavdevice/{alsa-audio-enc.c => alsa_enc.c} | 2 +- libavdevice/{jack_audio.c => jack.c} | 0 libavdevice/{oss_audio.c => oss.c} | 2 +- libavdevice/{oss_audio.h => oss.h} | 6 +++--- libavdevice/{oss_audio_dec.c => oss_dec.c} | 2 +- libavdevice/{oss_audio_enc.c => oss_enc.c} | 2 +- libavdevice/{sndio_common.c => sndio.c} | 2 +- libavdevice/{sndio_common.h => sndio.h} | 6 +++--- libavdevice/sndio_dec.c | 2 +- libavdevice/sndio_enc.c | 2 +- 14 files changed, 27 insertions(+), 29 deletions(-) rename libavdevice/{alsa-audio-common.c => alsa.c} (99%) rename libavdevice/{alsa-audio.h => alsa.h} (96%) rename libavdevice/{alsa-audio-dec.c => alsa_dec.c} (99%) rename libavdevice/{alsa-audio-enc.c => alsa_enc.c} (99%) rename libavdevice/{jack_audio.c => jack.c} (100%) rename libavdevice/{oss_audio.c => oss.c} (99%) rename libavdevice/{oss_audio.h => oss.h} (93%) rename libavdevice/{oss_audio_dec.c => oss_dec.c} (99%) rename libavdevice/{oss_audio_enc.c => oss_enc.c} (99%) rename libavdevice/{sndio_common.c => sndio.c} (99%) rename libavdevice/{sndio_common.h => sndio.h} (92%) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 2a2183288f..dfd56be842 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -7,19 +7,17 @@ OBJS = alldevices.o \ avdevice.o \ # input/output devices -OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \ - alsa-audio-dec.o -OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \ - alsa-audio-enc.o +OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o +OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o OBJS-$(CONFIG_BKTR_INDEV) += bktr.o OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o -OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o -OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o -OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o oss_audio_enc.o +OBJS-$(CONFIG_JACK_INDEV) += jack.o timefilter.o +OBJS-$(CONFIG_OSS_INDEV) += oss_dec.o oss.o +OBJS-$(CONFIG_OSS_OUTDEV) += oss_enc.o oss.o OBJS-$(CONFIG_PULSE_INDEV) += pulse.o -OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o -OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o +OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o +OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o @@ -31,7 +29,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o -SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h -SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h +SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h +SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h TESTPROGS = timefilter diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa.c similarity index 99% rename from libavdevice/alsa-audio-common.c rename to libavdevice/alsa.c index 21f1594241..6d68267602 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa.c @@ -33,7 +33,7 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" -#include "alsa-audio.h" +#include "alsa.h" static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id) { diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa.h similarity index 96% rename from libavdevice/alsa-audio.h rename to libavdevice/alsa.h index 26eaee6acf..590b354053 100644 --- a/libavdevice/alsa-audio.h +++ b/libavdevice/alsa.h @@ -27,8 +27,8 @@ * @author Benoit Fouet ( benoit fouet free fr ) */ -#ifndef AVDEVICE_ALSA_AUDIO_H -#define AVDEVICE_ALSA_AUDIO_H +#ifndef AVDEVICE_ALSA_H +#define AVDEVICE_ALSA_H #include #include "config.h" @@ -93,4 +93,4 @@ int ff_alsa_xrun_recover(AVFormatContext *s1, int err); int ff_alsa_extend_reorder_buf(AlsaData *s, int size); -#endif /* AVDEVICE_ALSA_AUDIO_H */ +#endif /* AVDEVICE_ALSA_H */ diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa_dec.c similarity index 99% rename from libavdevice/alsa-audio-dec.c rename to libavdevice/alsa_dec.c index a6a814b80f..2cc5b7d574 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa_dec.c @@ -53,7 +53,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" -#include "alsa-audio.h" +#include "alsa.h" static av_cold int audio_read_header(AVFormatContext *s1) { diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa_enc.c similarity index 99% rename from libavdevice/alsa-audio-enc.c rename to libavdevice/alsa_enc.c index db4f5e426f..30c1719203 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa_enc.c @@ -43,7 +43,7 @@ #include "libavformat/avformat.h" -#include "alsa-audio.h" +#include "alsa.h" static av_cold int audio_write_header(AVFormatContext *s1) { diff --git a/libavdevice/jack_audio.c b/libavdevice/jack.c similarity index 100% rename from libavdevice/jack_audio.c rename to libavdevice/jack.c diff --git a/libavdevice/oss_audio.c b/libavdevice/oss.c similarity index 99% rename from libavdevice/oss_audio.c rename to libavdevice/oss.c index 4feb937134..eb8d454422 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss.c @@ -39,7 +39,7 @@ #include "libavformat/avformat.h" -#include "oss_audio.h" +#include "oss.h" int ff_oss_audio_open(AVFormatContext *s1, int is_output, const char *audio_device) diff --git a/libavdevice/oss_audio.h b/libavdevice/oss.h similarity index 93% rename from libavdevice/oss_audio.h rename to libavdevice/oss.h index 87ac4adfd5..0fbe14b3ec 100644 --- a/libavdevice/oss_audio.h +++ b/libavdevice/oss.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVDEVICE_OSS_AUDIO_H -#define AVDEVICE_OSS_AUDIO_H +#ifndef AVDEVICE_OSS_H +#define AVDEVICE_OSS_H #include "libavcodec/avcodec.h" @@ -42,4 +42,4 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output, int ff_oss_audio_close(OSSAudioData *s); -#endif /* AVDEVICE_OSS_AUDIO_H */ +#endif /* AVDEVICE_OSS_H */ diff --git a/libavdevice/oss_audio_dec.c b/libavdevice/oss_dec.c similarity index 99% rename from libavdevice/oss_audio_dec.c rename to libavdevice/oss_dec.c index 601d91c31f..3f786cc356 100644 --- a/libavdevice/oss_audio_dec.c +++ b/libavdevice/oss_dec.c @@ -42,7 +42,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" -#include "oss_audio.h" +#include "oss.h" static int audio_read_header(AVFormatContext *s1) { diff --git a/libavdevice/oss_audio_enc.c b/libavdevice/oss_enc.c similarity index 99% rename from libavdevice/oss_audio_enc.c rename to libavdevice/oss_enc.c index 688982a00f..2f075589a9 100644 --- a/libavdevice/oss_audio_enc.c +++ b/libavdevice/oss_enc.c @@ -38,7 +38,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" -#include "oss_audio.h" +#include "oss.h" static int audio_write_header(AVFormatContext *s1) { diff --git a/libavdevice/sndio_common.c b/libavdevice/sndio.c similarity index 99% rename from libavdevice/sndio_common.c rename to libavdevice/sndio.c index 1bea6c5be1..739551b841 100644 --- a/libavdevice/sndio_common.c +++ b/libavdevice/sndio.c @@ -24,7 +24,7 @@ #include "libavformat/avformat.h" -#include "sndio_common.h" +#include "libavdevice/sndio.h" static inline void movecb(void *addr, int delta) { diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio.h similarity index 92% rename from libavdevice/sndio_common.h rename to libavdevice/sndio.h index 2f70213aed..cd5c55ecc5 100644 --- a/libavdevice/sndio_common.h +++ b/libavdevice/sndio.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVDEVICE_SNDIO_COMMON_H -#define AVDEVICE_SNDIO_COMMON_H +#ifndef AVDEVICE_SNDIO_H +#define AVDEVICE_SNDIO_H #include #include @@ -45,4 +45,4 @@ typedef struct SndioData { int ff_sndio_open(AVFormatContext *s1, int is_output, const char *audio_device); int ff_sndio_close(SndioData *s); -#endif /* AVDEVICE_SNDIO_COMMON_H */ +#endif /* AVDEVICE_SNDIO_H */ diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c index 24c6d1e7da..7ebb8c3ccc 100644 --- a/libavdevice/sndio_dec.c +++ b/libavdevice/sndio_dec.c @@ -29,7 +29,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" -#include "sndio_common.h" +#include "libavdevice/sndio.h" static av_cold int audio_read_header(AVFormatContext *s1) { diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index 61ac398a84..fad361062b 100644 --- a/libavdevice/sndio_enc.c +++ b/libavdevice/sndio_enc.c @@ -26,7 +26,7 @@ #include "libavformat/avformat.h" -#include "sndio_common.h" +#include "libavdevice/sndio.h" static av_cold int audio_write_header(AVFormatContext *s1) {