Author: titmuss
Date: Fri Aug 8 12:27:23 2008
New Revision: 2817
URL: http://svn.slimdevices.com?rev=2817&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2814): titmuss | 2008-08-08 20:24:53 +0100
Bug: N/A
Description:
Portaudio header is not required.
[EMAIL PROTECTED] (orig r2816): titmuss | 2008-08-08 20:26:32 +0100
[EMAIL PROTECTED] (orig r2815): titmuss | 2008-08-08 20:25:52 +0100
[EMAIL PROTECTED] (orig r2813): bklaas | 2008-08-08 20:00:12 +0100
Bug: 9079
Description: add LANGUAGE_NO LANGUAGE_SV and LANGAUGE_FI strings
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/strings.txt
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug 8 12:27:23 2008
@@ -1,8 +1,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2799
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2801
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2806
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2813
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2815
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2816
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/strings.txt
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/strings.txt?rev=2817&root=Jive&r1=2816&r2=2817&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/strings.txt
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/strings.txt
Fri Aug 8 12:27:23 2008
@@ -26,6 +26,42 @@
NL Taal
NO Språk
SV Språk
+
+LANGUAGE_NO
+ DA Norsk
+ DE Norsk
+ EN Norsk
+ ES Norsk
+ FI Norsk
+ FR Norsk
+ IT Norsk
+ NL Norsk
+ NO Norsk
+ SV Norsk
+
+LANGUAGE_SV
+ DA Svenska
+ DE Svenska
+ EN Svenska
+ ES Svenska
+ FI Svenska
+ FR Svenska
+ IT Svenska
+ NL Svenska
+ NO Svenska
+ SV Svenska
+
+LANGUAGE_FI
+ DA Suomi
+ DE Suomi
+ EN Suomi
+ ES Suomi
+ FI Suomi
+ FR Suomi
+ IT Suomi
+ NL Suomi
+ NO Suomi
+ SV Suomi
LANGUAGE_DA
DA Dansk
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=2817&root=Jive&r1=2816&r2=2817&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Fri
Aug 8 12:27:23 2008
@@ -8,7 +8,6 @@
#include "common.h"
-#include "portaudio.h"
#include <alsa/asoundlib.h>
#include "audio/fifo.h"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
