Mercurial > hg > dmlib

comparison src/dmsimple.c @ 1049:771e03bf9fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make more error message fall under DM_DEBUG.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 18:16:10 +0200
parents b387481e511e
children d98fcb10df6a
comparison
equal deleted inserted replaced
1048:509e6ed3a24e 1049:771e03bf9fcd
39 39
40 40
41 static BOOL argHandleOpt(const int optN, char *optArg, char *currArg) 41 static BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
42 { 42 {
43 (void) optArg; 43 (void) optArg;
44 (void) currArg;
44 45
45 switch (optN) 46 switch (optN)
46 { 47 {
47 case 0: 48 case 0:
48 argShowHelp(); 49 argShowHelp();
52 case 1: 53 case 1:
53 dmVerbosity++; 54 dmVerbosity++;
54 break; 55 break;
55 56
56 default: 57 default:
57 dmError(DMERR_INTERNAL, 58 dmErrorDBGMsg("Unknown option '%s'.\n", currArg);
58 "Unknown option '%s'.\n", currArg);
59 return FALSE; 59 return FALSE;
60 } 60 }
61 61
62 return TRUE; 62 return TRUE;
63 } 63 }
258 sscanf(str, "textWindowed %s", engine.setupTextWindowed) != 1 && 258 sscanf(str, "textWindowed %s", engine.setupTextWindowed) != 1 &&
259 sscanf(str, "textPrefix %s", engine.setupTextPrefix) != 1 && 259 sscanf(str, "textPrefix %s", engine.setupTextPrefix) != 1 &&
260 sscanf(str, "textEnterToStart %s", engine.setupTextEnterToStart) != 1 260 sscanf(str, "textEnterToStart %s", engine.setupTextEnterToStart) != 1
261 ) 261 )
262 { 262 {
263 res = dmError(DMERR_INVALID_DATA, 263 res = dmErrorDBG(DMERR_INVALID_DATA,
264 "Syntax error in configuration:\n%s\n", buf); 264 "Syntax error in configuration:\n%s\n", buf);
265 goto out; 265 goto out;
266 } 266 }
267 } 267 }
268 268
366 dmf_close(file); 366 dmf_close(file);
367 } 367 }
368 368
369 if (menuBgImage == NULL || menuBarImage == NULL) 369 if (menuBgImage == NULL || menuBarImage == NULL)
370 { 370 {
371 dmError(result, 371 dmErrorDBGMsg(
372 "Could not instantiate setup screen images, %d: %s\n", 372 "Could not instantiate setup screen images, %d: %s\n",
373 result, dmErrorStr(result)); 373 result, dmErrorStr(result));
374 goto out; 374 goto out;
375 } 375 }
376 376
377 if (menuBgImage->w != DM_VSETUP_WIDTH || 377 if (menuBgImage->w != DM_VSETUP_WIDTH ||
378 menuBgImage->h != DM_VSETUP_HEIGHT) 378 menuBgImage->h != DM_VSETUP_HEIGHT)
379 { 379 {
380 dmError(DMERR_INIT_FAIL, 380 dmErrorDBGMsg(
381 "Setup screen background image does not match " 381 "Setup screen background image does not match "
382 "required dimensions (%dx%d vs %dx%d)\n", 382 "required dimensions (%dx%d vs %dx%d)\n",
383 menuBgImage->w, menuBgImage->h, 383 menuBgImage->w, menuBgImage->h,
384 DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT); 384 DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT);
385 goto out; 385 goto out;
393 result = dmLoadBitmapFont(file, &menuFont); 393 result = dmLoadBitmapFont(file, &menuFont);
394 dmf_close(file); 394 dmf_close(file);
395 } 395 }
396 if (result != DMERR_OK) 396 if (result != DMERR_OK)
397 { 397 {
398 dmError(result, 398 dmErrorDBGMsg(
399 "Could not instantiate setup screen font, %d: %s\n", 399 "Could not instantiate setup screen font, %d: %s\n",
400 result, dmErrorStr(result)); 400 result, dmErrorStr(result));
401 goto out; 401 goto out;
402 } 402 }
403 403
404 SDL_Surface *tmp = dmConvertScaledSurface(menuBgImage, 404 SDL_Surface *tmp = dmConvertScaledSurface(menuBgImage,
405 engine.screen->format, engine.screen->flags, 405 engine.screen->format, engine.screen->flags,
406 engine.screen->w, engine.screen->h); 406 engine.screen->w, engine.screen->h);
407 if (tmp == NULL) 407 if (tmp == NULL)
408 { 408 {
409 dmError(DMERR_MALLOC, 409 dmErrorDBGMsg(
410 "Could not convert setup screen background image.\n"); 410 "Could not convert setup screen background image.\n");
411 goto out; 411 goto out;
412 } 412 }
413 413
414 SDL_FreeSurface(menuBgImage); 414 SDL_FreeSurface(menuBgImage);
620 // Initialize resource subsystem 620 // Initialize resource subsystem
621 dmPrint(1, "Initializing resources subsystem.\n"); 621 dmPrint(1, "Initializing resources subsystem.\n");
622 if ((err = dmResourcesInit(&engine.resources, engine.optPackFilename, 622 if ((err = dmResourcesInit(&engine.resources, engine.optPackFilename,
623 engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK) 623 engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK)
624 { 624 {
625 dmError(err, 625 dmErrorDBGMsg(
626 "Could not initialize resource manager, #%d: %s.\n", 626 "Could not initialize resource manager, #%d: %s.\n",
627 err, dmErrorStr(err)); 627 err, dmErrorStr(err));
628 goto error_exit; 628 goto error_exit;
629 } 629 }
630 630
681 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n", 681 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
682 engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq); 682 engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq);
683 683
684 if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL) 684 if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
685 { 685 {
686 dmError(DMERR_INIT_FAIL, 686 dmErrorDBGMsg(
687 "jvmInit() returned NULL, voi perkele.\n"); 687 "jvmInit() returned NULL, voi perkele.\n");
688 goto error_exit; 688 goto error_exit;
689 } 689 }
690 690
691 if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL) 691 if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL)
692 { 692 {
693 dmError(DMERR_INIT_FAIL, 693 dmErrorDBGMsg(
694 "jmpInit() returned NULL\n"); 694 "jmpInit() returned NULL\n");
695 goto error_exit; 695 goto error_exit;
696 } 696 }
697 #else 697 #else
698 dmError(DMERR_INTERNAL, "miniJSS support not included.\n"); 698 dmErrorDBGMsg("miniJSS support not included.\n");
699 #endif 699 #endif
700 break; 700 break;
701 701
702 case DM_ASETUP_TREMOR: 702 case DM_ASETUP_TREMOR:
703 #ifndef DM_USE_TREMOR 703 #ifndef DM_USE_TREMOR
704 dmError(DMERR_INTERNAL, "Tremor support not included.\n"); 704 dmErrorDBGMsg("Tremor support not included.\n");
705 #endif 705 #endif
706 break; 706 break;
707 } 707 }
708 708
709 // Initialize SDL audio 709 // Initialize SDL audio
711 engine.optAfmt.format, engine.optAfmt.channels, 711 engine.optAfmt.format, engine.optAfmt.channels,
712 engine.optAfmt.freq, engine.optAfmt.samples); 712 engine.optAfmt.freq, engine.optAfmt.samples);
713 713
714 if ((err = engineInitAudioParts(&engine)) != DMERR_OK) 714 if ((err = engineInitAudioParts(&engine)) != DMERR_OK)
715 { 715 {
716 dmError(err, 716 dmErrorDBGMsg(
717 "engineInitAudioParts() failed: #%d: %s\n", 717 "engineInitAudioParts() failed: #%d: %s\n",
718 err, dmErrorStr(err)); 718 err, dmErrorStr(err));
719 goto error_exit; 719 goto error_exit;
720 } 720 }
721 721
722 // Initialize SDL video 722 // Initialize SDL video
723 if (engine.demoInitPreVideo != NULL && 723 if (engine.demoInitPreVideo != NULL &&
724 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK) 724 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK)
725 { 725 {
726 dmError(err, 726 dmErrorDBGMsg(
727 "demoInitPreVideo() failed, #%d: %s\n", 727 "demoInitPreVideo() failed, #%d: %s\n",
728 err, dmErrorStr(err)); 728 err, dmErrorStr(err));
729 goto error_exit; 729 goto error_exit;
730 } 730 }
731 731
733 goto error_exit; 733 goto error_exit;
734 734
735 if (engine.demoInitPostVideo != NULL && 735 if (engine.demoInitPostVideo != NULL &&
736 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK) 736 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK)
737 { 737 {
738 dmError(err, 738 dmErrorDBGMsg(
739 "demoInitPostVideo() failed, #%d: %s\n", 739 "demoInitPostVideo() failed, #%d: %s\n",
740 err, dmErrorStr(err)); 740 err, dmErrorStr(err));
741 goto error_exit; 741 goto error_exit;
742 } 742 }
743 743
746 746
747 // Load resources 747 // Load resources
748 dmPrint(1, "Loading resources, please wait...\n"); 748 dmPrint(1, "Loading resources, please wait...\n");
749 if ((err = engineLoadResources()) != DMERR_OK) 749 if ((err = engineLoadResources()) != DMERR_OK)
750 { 750 {
751 dmError(err, 751 dmErrorDBGMsg(
752 "Error loading resources, #%d: %s.\n", 752 "Error loading resources, #%d: %s.\n",
753 err, dmErrorStr(err)); 753 err, dmErrorStr(err));
754 goto error_exit; 754 goto error_exit;
755 } 755 }
756 756
757 // Final initializations 757 // Final initializations
758 if ((err = engine.demoInit(&engine)) != DMERR_OK) 758 if ((err = engine.demoInit(&engine)) != DMERR_OK)
759 { 759 {
760 dmError(err, 760 dmErrorDBGMsg(
761 "Failure in demoInit(), #%d: %s\n", 761 "Failure in demoInit(), #%d: %s\n",
762 err, dmErrorStr(err)); 762 err, dmErrorStr(err));
763 goto error_exit; 763 goto error_exit;
764 } 764 }
765 765
766 // Initialize effects 766 // Initialize effects
767 if ((err = engineInitializeEffects(&engine)) != DMERR_OK) 767 if ((err = engineInitializeEffects(&engine)) != DMERR_OK)
768 { 768 {
769 dmError(err, 769 dmErrorDBGMsg(
770 "Effects initialization failed, #%d: %s\n", 770 "Effects initialization failed, #%d: %s\n",
771 err, dmErrorStr(err)); 771 err, dmErrorStr(err));
772 goto error_exit; 772 goto error_exit;
773 } 773 }
774 774
776 #ifdef DM_USE_TIMELINE 776 #ifdef DM_USE_TIMELINE
777 if (engine.timeline != NULL) 777 if (engine.timeline != NULL)
778 { 778 {
779 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK) 779 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK)
780 { 780 {
781 dmError(err, 781 dmErrorDBGMsg(
782 "Error loading timeline, #%d: %s\n", 782 "Error loading timeline, #%d: %s\n",
783 err, dmErrorStr(err)); 783 err, dmErrorStr(err));
784 goto error_exit; 784 goto error_exit;
785 } 785 }
786 786
787 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK) 787 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK)
788 { 788 {
789 dmError(err, 789 dmErrorDBGMsg(
790 "Error creating prepared timeline, #%d: %s\n", 790 "Error creating prepared timeline, #%d: %s\n",
791 err, dmErrorStr(err)); 791 err, dmErrorStr(err));
792 goto error_exit; 792 goto error_exit;
793 } 793 }
794 } 794 }