Author: ayoung
Date: Tue Aug 24 00:49:56 2010
New Revision: 9061

URL: http://svn.slimdevices.com/jive?rev=9061&view=rev
Log:
bug 16146: During the inter-track skip, the Touch seems to revert to 44.1 
Do not revert to 44100 when stopping output (such as happens with a skip)
but remember to force 44100 for loopback use.

Modified:
    7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
    7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c

Modified: 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=9061&r1=9060&r2=9061&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c 
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Tue 
Aug 24 00:49:56 2010
@@ -85,8 +85,6 @@
        LOG_DEBUG(log_audio_output, "decode_alsa_stop");
 
        ASSERT_AUDIO_LOCKED();
-
-       decode_audio->set_sample_rate = 44100;
 
        decode_alsa_check_pids();
 }

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c?rev=9061&r1=9060&r2=9061&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c 
(original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c 
Tue Aug 24 00:49:56 2010
@@ -761,6 +761,10 @@
 
                        do_open = 0;
 
+                       if (loopback) {
+                               decode_audio->set_sample_rate = 44100;
+                       }
+
                        if ((err = pcm_open(state, loopback, 
SND_PCM_STREAM_PLAYBACK)) < 0) {
                                LOG_ERROR("Playback open failed: %s", 
snd_strerror(err));
                                goto thread_error;

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins

Reply via email to