comparison editor/edtlobj.cpp @ 1738:b4992d9f72fe

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 09 Jun 2018 13:05:22 +0300
parents 93d1050eac99
children
comparison
equal deleted inserted replaced
1737:811b20de954c 1738:b4992d9f72fe
28 } 28 }
29 29
30 30
31 int EDTimelineObject::load(QString mfilename) 31 int EDTimelineObject::load(QString mfilename)
32 { 32 {
33 QByteArray fnba = mfilename.toUtf8();
34 DMResource *res; 33 DMResource *res;
35 DMTimeline *tmp; 34 DMTimeline *tmp;
36 if ((res = dmf_open_stdio(fnba.data(), "rb")) == NULL) 35 int err;
37 return DMERR_FOPEN;
38 36
39 int err = dmLoadTimeline(res, &tmp); 37 if ((err = dmf_open_stdio(mfilename.toUtf8().constData(), "rb", &res)) != DMERR_OK)
38 return err;
39
40 err = dmLoadTimeline(res, &tmp);
40 dmf_close(res); 41 dmf_close(res);
41 42
42 if (err == DMERR_OK) 43 if (err == DMERR_OK)
43 { 44 {
44 dmFreeTimeline(tl); 45 dmFreeTimeline(tl);
57 } 58 }
58 59
59 60
60 int EDTimelineObject::save(QString mfilename) 61 int EDTimelineObject::save(QString mfilename)
61 { 62 {
62 QByteArray fnba = mfilename.toUtf8();
63 DMResource *res; 63 DMResource *res;
64 if ((res = dmf_open_stdio(fnba.data(), "wb")) == NULL) 64 int err;
65 return DMERR_FOPEN;
66 65
67 int err = dmSaveTimeline(res, tl); 66 if ((err = dmf_open_stdio(mfilename.toUtf8().constData(), "wb", &res)) != DMERR_OK)
67 return err;
68
69 err = dmSaveTimeline(res, tl);
68 scrub(); 70 scrub();
69 71
70 dmf_close(res); 72 dmf_close(res);
71 return err; 73 return err;
72 } 74 }