Changeset 3f03199 in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/app/wavplay/dplay.c (modified) (5 diffs)

uspace/app/wavplay/dplay.c

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