[EGIT] [e16/e16] master 04/05: Sound: sound_pa -> sound_pulse

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=ec03e3cdb5f3c5fcd636bc2be901dba8d1776487

commit ec03e3cdb5f3c5fcd636bc2be901dba8d1776487
Author: Kim Woelders <k...@woelders.dk>
Date:   Sat Jan 9 09:30:57 2021 +0100

    Sound: sound_pa -> sound_pulse
---
 src/Makefile.am                   | 4 ++--
 src/sound.c                       | 4 ++--
 src/{sound_pa.c => sound_pulse.c} | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index fdfe437b..991da605 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,7 +188,7 @@ endif
 
 if USE_SOUND_PULSE
 LIBSND_PULSE = libsound_pulse.la
-libsound_pulse_la_SOURCES = sound_pa.c sound_load.c
+libsound_pulse_la_SOURCES = sound_pulse.c sound_load.c
 libsound_pulse_la_CFLAGS  = $(PA_CFLAGS) $(SNDLDR_CFLAGS)
 libsound_pulse_la_LIBADD  = $(PA_LIBS) $(SNDLDR_LIBS)
 libsound_pulse_la_LDFLAGS = -module -avoid-version
@@ -234,7 +234,7 @@ endif
 
 else
 
-MODULE_SRCS = sound_esd.c sound_pa.c sound_sndio.c sound_alsa.c sound_load.c \
+MODULE_SRCS = sound_esd.c sound_pulse.c sound_sndio.c sound_alsa.c 
sound_load.c \
        ttfont.c text_xft.c text_pango.c
 MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(ALSA_LIBS) $(SNDLDR_LIBS) 
$(PANGO_LIBS) $(XFT_LIBS)
 MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(SNDLDR_CFLAGS) 
$(PANGO_CFLAGS) $(XFT_CFLAGS)
diff --git a/src/sound.c b/src/sound.c
index b7149ea6..2dd5053c 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -84,8 +84,8 @@ static const SoundOps *ops = NULL;
 extern const SoundOps SoundOps_esd;
 static const SoundOps *ops = &SoundOps_esd;
 #elif USE_SOUND_PULSE
-extern const SoundOps SoundOps_pa;
-static const SoundOps *ops = &SoundOps_pa;
+extern const SoundOps SoundOps_pulse;
+static const SoundOps *ops = &SoundOps_pulse;
 #elif USE_SOUND_SNDIO
 extern const SoundOps SoundOps_sndio;
 static const SoundOps *ops = &SoundOps_sndio;
diff --git a/src/sound_pa.c b/src/sound_pulse.c
similarity index 98%
rename from src/sound_pa.c
rename to src/sound_pulse.c
index 0944425e..da6f5ac4 100644
--- a/src/sound_pa.c
+++ b/src/sound_pulse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2020 Kim Woelders
+ * Copyright (C) 2008-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -345,9 +345,9 @@ _sound_pa_Init(void)
    goto done;
 }
 
-__EXPORT__ extern const SoundOps SoundOps_pa;
+__EXPORT__ extern const SoundOps SoundOps_pulse;
 
-const SoundOps      SoundOps_pa = {
+const SoundOps      SoundOps_pulse = {
    _sound_pa_Init, _sound_pa_Exit, _sound_pa_Load, _sound_pa_Destroy,
    _sound_pa_Play,
 };

--