Changeset b412168 in mainline for uspace/app/modplay/modplay.c

Timestamp:

2014-11-17T03:25:04Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (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

File:

• uspace/app/modplay/modplay.c (modified) (2 diffs)

uspace/app/modplay/modplay.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <protracker.h>
 #include <trackmod.h>
 
@@ -88 +87 @@
         con = console_init(stdin, stdout);
 
-        rc = trackmod_protracker_load(argv[1], &mod);
+        rc = trackmod_module_load(argv[1], &mod);
         if (rc != EOK) {
                 printf("Error loading %s.\n", argv[1]);