event.h   event.h 
skipping to change at line 199 skipping to change at line 199
protected: protected:
/** Add event to pending queue. /** Add event to pending queue.
* *
* @param event the event to add * @param event the event to add
* @param cycles the clock to fire * @param cycles the clock to fire
* @param phase when to fire the event * @param phase when to fire the event
*/ */
void schedule (Event &event, const event_clock_t cycles, void schedule (Event &event, const event_clock_t cycles,
const event_phase_t phase) { const event_phase_t phase) {
event.triggerTime = (cycles << 1) + currentTime + (currentTime & 1 // this strange formulation always selects the next available slot
^ (phase == EVENT_CLOCK_PHI1 ? 0 : 1)); regardless of specified phase.
event.triggerTime = (cycles << 1) + currentTime + ((currentTime & 1
) ^ phase);
schedule(event); schedule(event);
} }
/** Add event to pending queue in the same phase as current event. /** Add event to pending queue in the same phase as current event.
* *
* @param event the event to add * @param event the event to add
* @param cycles how many cycles from now to fire * @param cycles how many cycles from now to fire
*/ */
void schedule(Event &event, const event_clock_t cycles) { void schedule(Event &event, const event_clock_t cycles) {
event.triggerTime = (cycles << 1) + currentTime; event.triggerTime = (cycles << 1) + currentTime;
 End of changes. 1 change blocks. 
2 lines changed or deleted 4 lines changed or added


 sidversion.h   sidversion.h 
#ifndef LIBSIDPLAYFP_VERSION_H #ifndef LIBSIDPLAYFP_VERSION_H
#define LIBSIDPLAYFP_VERSION_H #define LIBSIDPLAYFP_VERSION_H
#ifndef _sidplay2_h_ #ifndef _sidplay2_h_
# error Do not include directly. # error Do not include directly.
#endif #endif
#define LIBSIDPLAYFP_VERSION_MAJ 0 #define LIBSIDPLAYFP_VERSION_MAJ 0
#define LIBSIDPLAYFP_VERSION_MIN 3 #define LIBSIDPLAYFP_VERSION_MIN 3
#define LIBSIDPLAYFP_VERSION_LEV 3 #define LIBSIDPLAYFP_VERSION_LEV 4
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/