Changes in / [99c2c69e:11d41be5] in mainline

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• app/wavplay/dplay.c (modified) (5 diffs)
• app/wavplay/main.c (modified) (2 diffs)
• app/wavplay/wave.c (modified) (2 diffs)
• srv/audio/hound/audio_device.c (modified) (1 diff)

uspace/app/init/init.c

@@ -402 +402 @@
                 }
         }
-        srv_start("/srv/hound");
         
         return 0;

uspace/app/wavplay/dplay.c

@@ -151 +151 @@
             device_event_callback, pb);
         if (ret != EOK) {
-                printf("Failed to register event callback: %s.\n",
-                    str_error(ret));
+                printf("Failed to register event callback.\n");
                 return;
         }
@@ -286 +285 @@
                             pb->f.sample_format);
                         if (ret != EOK) {
-                                printf("Failed to start playback: %s\n",
-                                    str_error(ret));
+                                printf("Failed to start playback\n");
                                 return;
                         }
@@ -293 +291 @@
                         ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                         if (ret != EOK) {
-                                printf("Failed to update position indicator "
-                                   "%s\n", str_error(ret));
+                                printf("Failed to update position indicator\n");
                         }
                 }
@@ -311 +308 @@
                 const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
-                        printf("Failed to update position indicator %s\n",
-                            str_error(ret));
+                        printf("Failed to update position indicator\n");
                 }
                 getuptime(&time);
@@ -354 +350 @@
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
-                printf("Failed to get PCM info: %s.\n", str_error(ret));
+                printf("Failed to get PCM info.\n");
                 goto close_session;
         }

uspace/app/wavplay/main.c

@@ -79 +79 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing `%s' wav header: %s.\n", filename, error);
+                printf("Error parsing wav header: %s.\n", error);
                 fclose(source);
                 return EINVAL;
         }
-
-        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
-            format.channels, format.sampling_rate,
-            pcm_sample_format_str(format.sample_format));
 
         /* Allocate buffer and create new context */
@@ -140 +136 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing `%s' wav header: %s.\n", filename, error);
+                printf("Error parsing wav header: %s.\n", error);
                 fclose(source);
                 return EINVAL;
         }
-        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
-            format.channels, format.sampling_rate,
-            pcm_sample_format_str(format.sample_format));
 
         /* Connect new playback context */

uspace/app/wavplay/wave.c

@@ -81 +81 @@
         }
 
-        if (uint32_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
-                //TODO subchunk 1 sizes other than 16 are allowed ( 18, 40)
-                //http://www-mmsp.ece.mcgill.ca/documents/AudioFormats/WAVE/WAVE.html
+        if (uint16_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
                 if (error)
                         *error = "invalid subchunk1 size";
-//              return EINVAL;
+                return EINVAL;
         }
 
@@ -96 +94 @@
 
         if (str_lcmp(header->subchunk2_id, SUBCHUNK2_ID, 4) != 0) {
-                //TODO basedd on subchunk1 size, we might be reading wrong
-                //offset
                 if (error)
                         *error = "invalid subchunk2 id";
-//              return EINVAL;
+                return EINVAL;
         }
 
 
-        //TODO data and data_size are incorrect in extended wav formats
-        //pcm params are OK
         if (data)
                 *data = header->data;

uspace/srv/audio/hound/audio_device.c

@@ -162 +162 @@
                 }
                 audio_pcm_register_event_callback(dev->sess,
-                    device_event_callback, dev);
+                    device_event_callback, dev);\
 
                 /* Fill the buffer first. Fill the first two fragments,