Changeset 5108:44e0633255a1 in roaraudio for roard/driver_artsc.c
- Timestamp:
- 07/25/11 18:15:12 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/driver_artsc.c
r5056 r5108 55 55 (void)sstream; 56 56 57 ROAR_WARN("The aRtsc driver is obsolete/broken, use another!"); 58 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 59 57 60 if ( fh != -1 || device != NULL ) 58 61 return -1; … … 62 65 } 63 66 67 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 68 64 69 self = roar_mm_malloc(sizeof(struct roar_artsc)); 65 70 … … 68 73 69 74 memset(self, 0, sizeof(struct roar_artsc)); 75 76 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 70 77 71 78 if ( driver_artsc_init_shutdown(INIT) == -1 ) { … … 74 81 } 75 82 76 info->codec = ROAR_CODEC_DEFAULT; 83 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 84 85 if ( info->codec != ROAR_CODEC_DEFAULT ) { 86 if ( autoconfig ) { 87 info->codec = ROAR_CODEC_DEFAULT; 88 } else { 89 return -1; 90 } 91 } 92 93 if ( info->bits != 16 ) { 94 if ( autoconfig ) { 95 info->bits = 16; 96 } 97 } 77 98 78 99 self->info = info; 79 100 self->stream = arts_play_stream(info->rate, info->bits, info->channels, "roard"); 101 102 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 80 103 81 104 if ( self->stream == NULL && autoconfig ) { … … 84 107 } 85 108 109 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 110 86 111 if ( self->stream == NULL ) { 87 112 roar_mm_free(self); 88 113 driver_artsc_init_shutdown(SHUTDOWN); 89 return -1; 90 } 114 ROAR_DBG("driver_artsc_open_vio(*) = -1"); 115 return -1; 116 } 117 118 ROAR_DBG("driver_artsc_open_vio(*) = ?"); 91 119 92 120 memset(inst, 0, sizeof(struct roar_vio_calls)); … … 98 126 inst->nonblock = driver_artsc_nonblock; 99 127 128 ROAR_DBG("driver_artsc_open_vio(*) = 0"); 100 129 return 0; 101 130 } … … 103 132 ssize_t driver_artsc_write (struct roar_vio_calls * vio, void *buf, size_t count) { 104 133 struct roar_artsc * self = vio->inst; 105 int ret = arts_write(self->stream, buf, count); 106 107 if ( ret >= 0 ) 134 int ret; 135 136 ROAR_DBG("driver_artsc_write(*) = ?"); 137 138 ret = arts_write(self->stream, buf, count); 139 140 if ( ret >= 0 ) { 141 ROAR_DBG("driver_artsc_write(*) = %i", ret); 108 142 return ret; 109 143 } 144 145 ROAR_DBG("driver_artsc_write(*) = -1"); 110 146 return -1; 111 147 }
Note: See TracChangeset
for help on using the changeset viewer.