← Back to branch summary

~ubuntu-branches/ubuntu/raring/vice/raring

« back to all changes in this revision

Viewing changes to src/vic20/vic20.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.1.7 upstream) (9.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090331003715-i5yisvcfv7mgz3eh
Tags: 2.1.dfsg-1
http://bugs.debian.org/495937
http://bugs.debian.org/501181
* New major upstream release (closes: #495937).
* Add desktop files (closes: #501181).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vic20/vic20.c
44
44
#include "kbdbuf.h"
45
45
#include "keyboard.h"
46
46
#include "log.h"
 
47
#include "resources.h"
47
48
#include "machine-drive.h"
48
49
#include "machine-printer.h"
49
50
#include "machine-video.h"
67
68
#include "via.h"
68
69
#include "vic.h"
69
70
#include "vic20-cmdline-options.h"
 
71
#include "vic20-midi.h"
70
72
#include "vic20-resources.h"
71
73
#include "vic20-snapshot.h"
72
74
#include "vic20.h"
234
236
#endif
235
237
        || drive_resources_init() < 0
236
238
        || datasette_resources_init() < 0
237
 
        || cartridge_resources_init() <0)
 
239
        || cartridge_resources_init() <0
 
240
#ifdef HAVE_MIDI
 
241
        || vic20_midi_resources_init() <0
 
242
#endif
 
243
)
238
244
        return -1;
239
245
 
240
246
    return 0;
250
256
    printer_resources_shutdown();
251
257
    drive_resources_shutdown();
252
258
    cartridge_resources_shutdown();
 
259
#ifdef HAVE_MIDI
 
260
    midi_resources_shutdown();
 
261
#endif
253
262
}
254
263
 
255
264
/* VIC20-specific command-line option initialization.  */
271
280
#endif
272
281
        || drive_cmdline_options_init() < 0
273
282
        || datasette_cmdline_options_init() < 0
274
 
        || cartridge_cmdline_options_init() < 0)
 
283
        || cartridge_cmdline_options_init() < 0
 
284
#ifdef HAVE_MIDI
 
285
        || vic20_midi_cmdline_options_init() < 0
 
286
#endif
 
287
)
275
288
        return -1;
276
289
 
277
290
    return 0;
386
399
 
387
400
    vic20iec_init();
388
401
 
 
402
#ifdef HAVE_MIDI
 
403
    midi_init();
 
404
#endif
 
405
 
389
406
    machine_drive_stub();
390
407
 
 
408
#if defined (USE_XF86_EXTENSIONS) && \
 
409
    (defined(USE_XF86_VIDMODE_EXT) || defined (HAVE_XRANDR))
 
410
    {
 
411
        /* set fullscreen if user used `-fullscreen' on cmdline */
 
412
        int fs;
 
413
        resources_get_int("UseFullscreen", &fs);
 
414
        if (fs)
 
415
            resources_set_int("VICFullscreen", 1);
 
416
    }
 
417
#endif
391
418
    return 0;
392
419
}
393
420
 
407
434
 
408
435
    rs232drv_reset();
409
436
    rsuser_reset();
 
437
#ifdef HAVE_MIDI
 
438
    midi_reset();
 
439
#endif
410
440
 
411
441
    printer_reset();
412
442
    drive_reset();