ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/SID.cpp
(Generate patch)

Comparing Frodo4/Src/SID.cpp (file contents):
Revision 1.8 by cebix, 2005-06-27T19:55:48Z vs.
Revision 1.9 by cebix, 2010-04-22T07:58:53Z

# Line 1 | Line 1
1   /*
2   *  SID.cpp - 6581 emulation
3   *
4 < *  Frodo (C) 1994-1997,2002-2005 Christian Bauer
4 > *  Frodo Copyright (C) Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 354 | Line 354 | struct DRVoice {
354   // Renderer class
355   class DigitalRenderer : public SIDRenderer {
356   public:
357 – #if defined(__BEOS__) || defined(__riscos__)
357          DigitalRenderer(C64 *c64);
359 – #else
360 –        DigitalRenderer();
361 – #endif
358          virtual ~DigitalRenderer();
359  
360          virtual void Reset(void);
# Line 377 | Line 373 | private:
373          void calc_buffer(int16 *buf, long count);
374   #endif
375  
376 +        C64 *the_c64;                                   // Pointer to C64 object
377 +
378          bool ready;                                             // Flag: Renderer has initialized and is ready
379          uint8 volume;                                   // Master volume
380  
# Line 418 | Line 416 | private:
416  
417   #ifdef __BEOS__
418          static void buffer_proc(void *cookie, void *buffer, size_t size, const media_raw_audio_format &format);
421 –        C64 *the_c64;                                   // Pointer to C64 object
419          BSoundPlayer *the_player;               // Pointer to sound player
420          bool player_stopped;                    // Flag: player stopped
421   #endif
# Line 491 | Line 488 | private:
488   #ifdef __riscos__
489          int linecnt, sndbufsize;
490          uint8 *sound_buffer;
494 –        C64 *the_c64;
491   #endif
492   };
493  
# Line 822 | Line 818 | const int16 DigitalRenderer::SampleTab[1
818   *  Constructor
819   */
820  
825 – #if defined(__BEOS__) || defined(__riscos__)
821   DigitalRenderer::DigitalRenderer(C64 *c64) : the_c64(c64)
827 – #else
828 – DigitalRenderer::DigitalRenderer()
829 – #endif
822   {
823          // Link voices together
824          voice[0].mod_by = &voice[2];
# Line 1384 | Line 1376 | void MOS6581::open_close_renderer(int ol
1376          delete the_renderer;
1377  
1378          // Create new renderer
1379 <        if (new_type == SIDTYPE_DIGITAL)
1388 < #if defined(__BEOS__) || defined(__riscos__)
1379 >        if (new_type == SIDTYPE_DIGITAL) {
1380                  the_renderer = new DigitalRenderer(the_c64);
1390 – #else
1391 –                the_renderer = new DigitalRenderer;
1392 – #endif
1381   #ifdef AMIGA
1382 <        else if (new_type == SIDTYPE_SIDCARD)
1382 >        } else if (new_type == SIDTYPE_SIDCARD) {
1383                  the_renderer = new SIDCardRenderer;
1384   #endif
1385   #ifdef __linux__
1386 <        else if (new_type == SIDTYPE_SIDCARD)
1386 >        } else if (new_type == SIDTYPE_SIDCARD) {
1387                  the_renderer = new CatweaselRenderer;
1388   #endif
1389 <        else
1389 >        } else {
1390                  the_renderer = NULL;
1391 +        }
1392  
1393          // Stuff the current register values into the new renderer
1394          if (the_renderer != NULL)

Diff Legend

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