Author: titmuss
Date: Fri Oct 24 13:01:13 2008
New Revision: 3212
URL: http://svn.slimdevices.com?rev=3212&root=Jive&view=rev
Log:
Bug: N/A
Description:
Plumbing for audio gain control on squeezeplay.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=3212&root=Jive&r1=3211&r2=3212&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua Fri Oct
24 13:01:13 2008
@@ -65,6 +65,14 @@
obj.slimproto:subscribe("cont", function(_, data)
return obj:_cont(data)
+ end)
+
+ obj.slimproto:subscribe("audg", function(_, data)
+ return obj:_audg(data)
+ end)
+
+ obj.slimproto:subscribe("aude", function(_, data)
+ return obj:_aude(data)
end)
obj.timer = Timer(100, function()
@@ -426,6 +434,16 @@
end
+function _aude(self, data)
+ Decode:audioEnable(data.enable)
+end
+
+
+function _audg(self, data)
+ Decode:audioGain(data.gainL, data.gainR)
+end
+
+
--[[
=head1 LICENSE
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c?rev=3212&root=Jive&r1=3211&r2=3212&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c Fri Oct 24
13:01:13 2008
@@ -564,6 +564,27 @@
return 1;
}
+static int decode_audio_enable(lua_State *L) {
+ int enable;
+
+ enable = lua_toboolean(L, 2);
+
+ // FIXME
+
+ return 0;
+}
+
+static int decode_audio_gain(lua_State *L) {
+ s32_t lgain, rgain;
+
+ lgain = lua_tointeger(L, 2);
+ rgain = lua_tointeger(L, 3);
+
+ decode_audio->gain(lgain, rgain);
+
+ return 0;
+}
+
static const struct luaL_Reg decode_f[] = {
{ "resume", decode_resume },
{ "pause", decode_pause },
@@ -574,6 +595,8 @@
{ "songEnded", decode_song_ended },
{ "status", decode_status },
{ "streamMetadata", decode_stream_metadata },
+ { "audioEnable", decode_audio_enable },
+ { "audioGain", decode_audio_gain },
{ NULL, NULL }
};
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3212&root=Jive&r1=3211&r2=3212&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Fri
Oct 24 13:01:13 2008
@@ -447,6 +447,12 @@
}
+static void decode_alsa_gain(s32_t lgain, s32_t rgain)
+{
+ printf("fixme gain %d,%d\n", lgain, rgain);
+}
+
+
struct decode_audio decode_alsa = {
decode_alsa_init,
decode_alsa_start,
@@ -454,6 +460,7 @@
decode_alsa_resume,
decode_alsa_stop,
decode_alsa_delay,
+ decode_alsa_gain,
};
#endif // HAVE_LIBASOUND
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=3212&root=Jive&r1=3211&r2=3212&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Fri Oct 24 13:01:13 2008
@@ -299,12 +299,20 @@
}
+static void decode_portaudio_gain(s32_t lgain, s32_t rgain)
+{
+ printf("fixme gain %d,%d\n", lgain, rgain);
+}
+
+
struct decode_audio decode_portaudio = {
decode_portaudio_init,
decode_portaudio_start,
decode_portaudio_pause,
decode_portaudio_resume,
decode_portaudio_stop,
+ NULL,
+ decode_portaudio_gain,
};
#endif // HAVE_PORTAUDIO
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h?rev=3212&root=Jive&r1=3211&r2=3212&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h Fri
Oct 24 13:01:13 2008
@@ -92,6 +92,7 @@
void (*resume)(void);
void (*stop)(void);
u32_t (*delay)(void);
+ void (*gain)(s32_t lgain, s32_t rgain);
};
extern struct decode_audio decode_alsa;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
