avdevice: Apply a more consistent file naming scheme

DonDiego · DonDiego · commit 8d26c193fb42 · 2015-04-09T16:40:12.000+02:00
diff --git 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.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.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 <alsa/asoundlib.h>
 #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_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_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.c b/libavdevice/jack.c
diff --git a/libavdevice/oss.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.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_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_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.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.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 <stdint.h>
 #include <sndio.h>
@@ -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
@@ -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
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#include "libavutil/avassert.h"`
`34`	`34`	`#include "libavutil/channel_layout.h"`
`35`	`35`
`36`		`-#include "alsa-audio.h"`
	`36`	`+#include "alsa.h"`
`37`	`37`
`38`	`38`	`static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`#include "libavformat/avformat.h"`
`54`	`54`	`#include "libavformat/internal.h"`
`55`	`55`
`56`		`-#include "alsa-audio.h"`
	`56`	`+#include "alsa.h"`
`57`	`57`
`58`	`58`	`static av_cold int audio_read_header(AVFormatContext *s1)`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`
`44`	`44`	`#include "libavformat/avformat.h"`
`45`	`45`
`46`		`-#include "alsa-audio.h"`
	`46`	`+#include "alsa.h"`
`47`	`47`
`48`	`48`	`static av_cold int audio_write_header(AVFormatContext *s1)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`#include "libavformat/avformat.h"`
`43`	`43`	`#include "libavformat/internal.h"`
`44`	`44`
`45`		`-#include "oss_audio.h"`
	`45`	`+#include "oss.h"`
`46`	`46`
`47`	`47`	`static int audio_read_header(AVFormatContext *s1)`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`#include "libavformat/avformat.h"`
`39`	`39`	`#include "libavformat/internal.h"`
`40`	`40`
`41`		`-#include "oss_audio.h"`
	`41`	`+#include "oss.h"`
`42`	`42`
`43`	`43`	`static int audio_write_header(AVFormatContext *s1)`
`44`	`44`	`{`