# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: stewb@linux-foundation.org-20100421195949-\ # uxj4kdx8wqj358f3 # target_branch: bzr+ssh://stewb@bzr.linux-foundation.org/srv/www/bzr\ # /lsb/devel/t2c-alsa-tests/ # testament_sha1: 0f205eedf413303e6f5a22ec23f2f107a42ecbac # timestamp: 2010-04-21 16:03:28 -0400 # base_revision_id: stew@acer.e-artisan.org-20100419160040-\ # riocqdhrn9z9mclo # # Begin patch === modified file 'alsa-t2c/ALSA-t2c/src/ALSA_PCM_Interface_General_Functions.t2c' --- alsa-t2c/ALSA-t2c/src/ALSA_PCM_Interface_General_Functions.t2c 2010-02-10 14:42:08 +0000 +++ alsa-t2c/ALSA-t2c/src/ALSA_PCM_Interface_General_Functions.t2c 2010-04-21 19:59:49 +0000 @@ -480,16 +480,28 @@ snd_pcm_t* pcm = 0; + int res; + snd_pcm_open( (snd_pcm_t**)&pcm, NAME, STREAM, SND_PCM_NONBLOCK); //target call + + if (res < 0) + { + REQ( "snd_pcm_open.06.02", "", (res < 0) ); + } + else + { + REQ( "snd_pcm_open.06.01", "", (res == 0) ); + } + "hw:0" - SET(SND_PCM_STREAM_PLAYBACK; SND_PCM_STREAM_CAPTURE) + SET(SND_PCM_STREAM_PLAYBACK; SND_PCM_STREAM_CAPTURE; -1) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVE8AGMAAdHfgEQQUWf//3+v fiC////6UAPm3qlHVRi7drcJJBEYRTeCTap+qek/VNqaeo9QbUB6RiaNPUNPUEkiMIDVPKTyj0mJ pk9T1GjIaANMmQ9EA0JoomaT1NoaaNE0aGAAAAmE00NDjJkyYjEwAmTBMgBowjAEMAkomjRqYptB 6JpGmjRPUyZNMnqYBGBGQekaKS2+WSd/bWV3cbWyw+eWk4ndQsoyyN45cHwEYYZ3vpZ+exAEUjSa Thm+sDMVXnVezMGPma7sVElDyq6AnmKMLJDmr1L88no15Qf3ygTskBxGGfSAP15iQRTXlrcjXhI6 LTeFDTm9ERkdrvsdTgnHYw8sBrHUmCeO8Sf/QNxesF66RazSNdtrdckabDa1IdLtYyYChizJjPC5 Mg59SFBPe7fN9wJ60GEZkmL+SFwp87rXoVFLBNV7t2XDWn1KETY3BiUlqx0ma6CyibgJSjFnIPuv QrHMLOlwcgweYxJlR4JOUE2X9T8YlxtFnWsjBRyjXJyueVF6qVTCqVz6yIZCYiaB5eKi1qWalpbk HU7G1rCMaXkCghMKoUheNJLG4iCrVxQkV44Wl+6RIEVaYEd3FX7paqiJQdNTYYso1auHjs83zk6R eZlCBQXEKt9osJp0BUHimZ5FxNSpAcf5cCnmXzUk+JeWhCvi5T69XCaj2KDC9rG27waUqdjg57i1 ifVvNmZ+RxKzn7l5Uo6oVn27uFkwMd0Me/r2radykxZBXQiOZio3qwqsO/5HYU7MeuZnO4wmo/u6 1z+A5PWOleA8GW8xUObrxyD3gx06zqX7WymQ2Bg3T9PTqoYyUWytFJWLIDZ0HvMT4HuGOZKnKLoo 2c7dBOTEQ+I4kXFldyuatWo2d6hJX9JjkdYbyRQUg6VDJFDruKjSUd4sPR+E0DR1lRm12l5TKY2q eIeeJDV957Obn3XLn/0fymROuiyqhlpmCUMC5RHgMJTyOjjLRPWoe4PEeNN89N/gwsC0DNTsGCIc Avi0iD8isVSMsCt1KIymdxx5E4xT8IYJ4HTqAjLPWrMADEmBuAWbbqNYvQWf7K44xWBn+SgtCk0L m+jBP9dKnT14seSCLQ2qQ919JKrvZJrLVTLFwxFMly0JA0wIw2aoFAkADZIWg5WL3QIRmQMiFd9C loJzADiY69MCbQF6R+pFrcqpAI4y665UolHpRhGeQ24tYv3pnoRzM4G7bsIC1rcv1uwZPmrEhpeN PDjKFZwDg8TkBkZNtohmDOqT4qFCyIpYUAG4n8Q+DsTRO7MemeFQxqpjwfjopWV7DNqPVNPTAQ8l o4x5ACuRTBQDBg1ii05tX+gA8eBULiTVlSCH3FgBOJha1FU1uc5uhbVVMSdIf8XckU4UJBRPABjA