summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-10-02 02:42:28 +1000
committer Vas Crabb <vas@vastheman.com>2020-10-02 02:42:28 +1000
commit54048b3407d23af7959e4f94701aba7cb1119ad8 (patch)
tree7b984d5fac95fe03bafeb30860a9fa6995c3a3c0 /src/tools
parent7550749c670d6408384015274a557937d25b7b96 (diff)
-imagedev/cassimg.cpp: Make the interface look something like C++.
-sound/tiasound.cpp: Use some vaguely C++-like code internally.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/castool.cpp31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/tools/castool.cpp b/src/tools/castool.cpp
index 0b2b4230f8b..b67d9b4e303 100644
--- a/src/tools/castool.cpp
+++ b/src/tools/castool.cpp
@@ -10,15 +10,6 @@
***************************************************************************/
-#include <cstdio>
-#include <cstring>
-#include <cctype>
-#include <cstdlib>
-#include <ctime>
-#include <cassert>
-
-#include "corestr.h"
-
#include "formats/a26_cas.h"
#include "formats/ace_tap.h"
#include "formats/adam_cas.h"
@@ -61,10 +52,20 @@
#include "formats/x1_tap.h"
#include "formats/zx81_p.h"
+#include "corestr.h"
+
+#include <cassert>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+
+
struct SupportedCassetteFormats
{
const char *name;
- const struct CassetteFormat * const *formats;
+ const cassette_image::Format * const *formats;
const char *desc;
};
@@ -159,8 +160,8 @@ int CLIB_DECL main(int argc, char *argv[])
{
int i;
int found =0;
- const struct CassetteFormat * const *selected_formats = nullptr;
- cassette_image *cassette;
+ const cassette_image::Format * const *selected_formats = nullptr;
+ cassette_image::ptr cassette;
FILE *f;
if (argc > 1)
@@ -193,14 +194,14 @@ int CLIB_DECL main(int argc, char *argv[])
return -1;
}
- if (cassette_open_choices(f, &stdio_ioprocs, get_extension(argv[3]), selected_formats, CASSETTE_FLAG_READONLY, &cassette) != cassette_image::error::SUCCESS) {
+ if (cassette_image::open_choices(f, &stdio_ioprocs, get_extension(argv[3]), selected_formats, CASSETTE_FLAG_READONLY, cassette) != cassette_image::error::SUCCESS) {
fprintf(stderr, "Invalid format of input file.\n");
fclose(f);
return -1;
}
- cassette_dump(cassette,argv[4]);
- cassette_close(cassette);
+ cassette->dump(argv[4]);
+ cassette.reset();
fclose(f);
goto theend;
}