ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SIDPlayer/src/main_sdl.cpp
(Generate patch)

Comparing SIDPlayer/src/main_sdl.cpp (file contents):
Revision 1.4 by cebix, 2001-01-16T14:12:54Z vs.
Revision 1.5 by cebix, 2001-01-16T16:53:26Z

# Line 35 | Line 35
35  
36   static void usage(const char *prg_name)
37   {
38 <        printf("\nUsage: %s [options] FILE [song_number]]\n", prg_name);
38 >        printf("Usage: %s [OPTION...] FILE [song_number]]\n", prg_name);
39 >        PrefsPrintUsage();
40          exit(0);
41   }
42  
# Line 50 | Line 51 | int main(int argc, char **argv)
51          // Print banner
52          printf(
53                  PACKAGE " Version " VERSION "\n\n"
54 <                "Copyright (C) 1996-2000 Christian Bauer\n"
54 >                "Copyright (C) 1996-2001 Christian Bauer\n"
55                  "E-mail: Christian.Bauer@uni-mainz.de\n"
56                  "http://www.uni-mainz.de/~bauec002/\n\n"
57                  "This is free software with ABSOLUTELY NO WARRANTY.\n"
# Line 58 | Line 59 | int main(int argc, char **argv)
59                  "For details, see the file COPYING.\n\n"
60          );
61  
62 <        // Parse arguments
62 >        // Initialize everything
63 >        if (SDL_Init(SDL_INIT_AUDIO) < 0) {
64 >                fprintf(stderr, "Couldn't initialize SDL (%s)\n", SDL_GetError());
65 >                exit(1);
66 >        }
67 >        atexit(quit);
68 >        InitAll(argc, argv);
69 >        int32 selected_speed = PrefsFindInt32("speed");
70 >
71 >        // Parse non-option arguments
72          if (argc < 2)
73                  usage(argv[0]);
74          char *file_name = argv[argc - 1];
# Line 76 | Line 86 | int main(int argc, char **argv)
86                  }
87          }
88  
79 –        // Initialize everything
80 –        if (SDL_Init(SDL_INIT_AUDIO) < 0) {
81 –                fprintf(stderr, "Couldn't initialize SDL (%s)\n", SDL_GetError());
82 –                exit(1);
83 –        }
84 –        atexit(quit);
85 –        InitAll(argc, argv);
86 –
89          // Load given PSID file
90          if (!LoadPSIDFile(file_name)) {
91                  fprintf(stderr, "Couldn't load '%s' (not a PSID file?)\n", file_name);
# Line 104 | Line 106 | int main(int argc, char **argv)
106          printf("Playing song %d/%d\n", current_song + 1, number_of_songs);
107  
108          // Start replay and enter main loop
109 <        SIDAdjustSpeed(PrefsFindInt32("speed"));
109 >        SIDAdjustSpeed(selected_speed); // SelectSong resets this to 100%
110          SDL_PauseAudio(false);
111          while (true) {
112                  SDL_Event e;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines