Author: richard
Date: Fri Feb 6 03:43:48 2009
New Revision: 4060
URL: http://svn.slimdevices.com?rev=4060&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix test tones, add a left channel only tone.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/strings.txt
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.h
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackApplet.lua?rev=4060&root=Jive&r1=4059&r2=4060&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackApplet.lua
Fri Feb 6 03:43:48 2009
@@ -12,7 +12,7 @@
local SlimServer = require("jive.slim.SlimServer")
local LocalPlayer = require("jive.slim.LocalPlayer")
-local Decode = require("squeezeplay.decode")
+local decode = require("squeezeplay.decode")
local Framework = require("jive.ui.Framework")
local Checkbox = require("jive.ui.Checkbox")
@@ -137,7 +137,7 @@
window:addWidget(menu)
window:addTimer(1000, function()
- local status = Decode:status()
+ local status = decode:status()
values[1]:setValue(decoders[string.char(status.decoder
or 0)] or "?")
values[2]:setValue(string.format('%0.1f%%',
status.decodeFull / status.decodeSize * 100))
@@ -159,52 +159,73 @@
{ text = self:string("MULTITONE"),
sound = "WINDOWSHOW",
callback = function(event)
- Decode:start(
+ decode:flush()
+ decode:start(
string.byte('t'), 0, 0, 0, 0, 0, 1
)
- Decode:resume()
- end
- },
- { text = self:string("SINE_44.1k"),
- sound = "WINDOWSHOW",
- callback = function(event)
- Decode:start(
+ decode:resumeDecoder()
+ decode:resumeAudio()
+ end
+ },
+ { text = self:string("LEFT_CHANNEL"),
+ sound = "WINDOWSHOW",
+ callback = function(event)
+ decode:flush()
+ decode:start(
+ string.byte('t'), 0, 0, 0, 0, 0, 2
+ )
+ decode:resumeDecoder()
+ decode:resumeAudio()
+ end
+ },
+ { text = self:string("SINE_44_1K"),
+ sound = "WINDOWSHOW",
+ callback = function(event)
+ decode:flush()
+ decode:start(
string.byte('t'), 0, 0, 0, 0, 0, 10
)
- Decode:resume()
+ decode:resumeDecoder()
+ decode:resumeAudio()
end
},
{ text = self:string("SINE_48k"),
sound = "WINDOWSHOW",
callback = function(event)
- Decode:start(
+ decode:flush()
+ decode:start(
string.byte('t'), 0, 0, 0, 0, 0, 11
)
- Decode:resume()
- end
- },
- { text = self:string("SINE_88.2K"),
- sound = "WINDOWSHOW",
- callback = function(event)
- Decode:start(
+ decode:resumeDecoder()
+ decode:resumeAudio()
+ end
+ },
+ { text = self:string("SINE_88_2K"),
+ sound = "WINDOWSHOW",
+ callback = function(event)
+ decode:flush()
+ decode:start(
string.byte('t'), 0, 0, 0, 0, 0, 12
)
- Decode:resume()
+ decode:resumeDecoder()
+ decode:resumeAudio()
end
},
{ text = self:string("SINE_96K"),
sound = "WINDOWSHOW",
callback = function(event)
- Decode:start(
+ decode:flush()
+ decode:start(
string.byte('t'), 0, 0, 0, 0, 0, 13
)
- Decode:resume()
+ decode:resumeDecoder()
+ decode:resumeAudio()
end
},
{ text = self:string("SINE_STOP"),
sound = "WINDOWSHOW",
callback = function(event)
- Decode:stop()
+ decode:stop()
end
},
})
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/strings.txt
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/strings.txt?rev=4060&root=Jive&r1=4059&r2=4060&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/strings.txt
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/strings.txt
Fri Feb 6 03:43:48 2009
@@ -134,7 +134,11 @@
NO Multitone
SV Flera toner
-SINE_44 DA Sinus 44,1 k
+LEFT_CHANNEL
+ EN Left channel
+
+SINE_44_1K
+ DA Sinus 44,1 k
DE Sinus 44.1k
EN Sine 44.1k
ES Seno 44,1 kHz
@@ -144,7 +148,6 @@
NL Sinus 44.1 k
NO Sinus 44.1k
SV Sinus 44,1 k
-.1k
SINE_48k
DA Sinus 48 k
@@ -158,7 +161,8 @@
NO Sinus 48k
SV Sinus 48 k
-SINE_88 DA Sinus 88,2 k
+SINE_88_2K
+ DA Sinus 88,2 k
DE Sinus 88.2k
EN Sine 88.2k
ES Seno 88,2 kHz
@@ -168,7 +172,6 @@
NL Sinus 88.2 k
NO Sinus 88.2k
SV Sinus 88,2 k
-.2K
SINE_96K
DA Sinus 96 k
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.h
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.h?rev=4060&root=Jive&r1=4059&r2=4060&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.h (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.h Fri Feb 6
03:43:48 2009
@@ -24,6 +24,7 @@
#define TESTTONES_OFF 0
#define TESTTONES_MULTITONE 1
+#define TESTTONES_LEFT_CHANNEL 2
#define TESTTONES_SINE40_44100 10
#define TESTTONES_SINE40_48000 11
#define TESTTONES_SINE40_88200 12
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c?rev=4060&root=Jive&r1=4059&r2=4060&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c Fri
Feb 6 03:43:48 2009
@@ -26,6 +26,7 @@
#define DECODE_TONES_MODE_SINE40 1
#define DECODE_TONES_MODE_MULTITONE 2
+#define DECODE_TONES_MODE_LEFT_CHANNEL 3
#define INVERT24(n) ( ((n & 0x00ffffff)==0x00800000) ? \
@@ -115,7 +116,8 @@
*write_pos++ = sample << 8;
}
break;
-
+
+ case DECODE_TONES_MODE_LEFT_CHANNEL:
case DECODE_TONES_MODE_MULTITONE:
for (i = 0; i < BLOCKSIZE; i+=2) {
@@ -123,7 +125,7 @@
self->count = 0;
self->tones_multitone_test++;
- if (self->tones_multitone_test > 15) {
+ if ((self->mode ==
DECODE_TONES_MODE_LEFT_CHANNEL && self->tones_multitone_test > 5) ||
self->tones_multitone_test > 15) {
self->tones_multitone_test = 1;
}
}
@@ -199,6 +201,10 @@
self->mode = DECODE_TONES_MODE_MULTITONE;
self->sample_rate = 44100;
break;
+ case TESTTONES_LEFT_CHANNEL:
+ self->mode = DECODE_TONES_MODE_LEFT_CHANNEL;
+ self->sample_rate = 44100;
+ break;
case TESTTONES_SINE40_44100:
self->mode = DECODE_TONES_MODE_SINE40;
self->sample_rate = 44100;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
