Changeset 0f79e202ee068af55a689d2aa5b4f37988080063
- Timestamp:
- 04/17/08 17:33:14
(3 months ago)
- Author:
- Richard Hosking <richard@hovis.net>
- git-committer:
- Richard Hosking <richard@hovis.net> 1208446394 +0100
- git-parent:
[4dbeeda8ade44481672b264d4f1c89444cbf8efb]
- git-author:
- Richard Hosking <richard@hovis.net> 1208446394 +0100
- Message:
i_fd is not applicable for Alsa so don't try and close it if one of the Alsa routines fail.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rf94a2f9 |
r0f79e20 |
|
| 2260 | 2260 | { |
|---|
| 2261 | 2261 | char *psz_device = p_sys->psz_adev; |
|---|
| 2262 | | int i_fd = 0; |
|---|
| 2263 | 2262 | p_sys->p_alsa_pcm = NULL; |
|---|
| 2264 | 2263 | char* psz_alsa_device_name = NULL; |
|---|
| … | … | |
| 2427 | 2426 | } |
|---|
| 2428 | 2427 | |
|---|
| 2429 | | /* Return a fake handle so other tests work */ |
|---|
| 2430 | | i_fd = 1; |
|---|
| 2431 | | |
|---|
| 2432 | 2428 | free( psz_alsa_device_name ); |
|---|
| 2433 | 2429 | |
|---|
| 2434 | 2430 | if( !p_sys->psz_adev ) |
|---|
| 2435 | 2431 | p_sys->psz_adev = strdup( ALSA_DEFAULT ); |
|---|
| 2436 | | return i_fd; |
|---|
| | 2432 | |
|---|
| | 2433 | /* Return a fake handle so other tests work */ |
|---|
| | 2434 | return 1; |
|---|
| 2437 | 2435 | |
|---|
| 2438 | 2436 | adev_fail: |
|---|
| 2439 | | |
|---|
| 2440 | | if( i_fd >= 0 ) close( i_fd ); |
|---|
| 2441 | 2437 | |
|---|
| 2442 | 2438 | if( p_hw_params ) snd_pcm_hw_params_free( p_hw_params ); |
|---|