~ubuntu-branches/ubuntu/vivid/vice/vivid-proposed

« back to all changes in this revision

Viewing changes to src/sid/resid.cc

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2014-10-19 08:05:48 UTC
  • mfrom: (17.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20141019080548-mb75mi9i7d3k7ui3
Tags: 2.4.dfsg+2.4.9-2
Re-try to fix build race with building in po/ first.

Show diffs side-by-side

added added

removed removed

Lines of Context:
174
174
        break;
175
175
      case 3:
176
176
        method = SAMPLE_RESAMPLE_FASTMEM;
177
 
        sprintf(method_text, "resampling, pass to %dHz", (int)passband);
 
177
        sprintf(method_text, "fast resampling, pass to %dHz", (int)passband);
178
178
        break;
179
179
    }
180
180
 
260
260
    }
261
261
    sid_state->write_pipeline = (BYTE)state.write_pipeline;
262
262
    sid_state->write_address = (BYTE)state.write_address;
 
263
    sid_state->voice_mask = (BYTE)state.voice_mask;
263
264
}
264
265
 
265
266
static void resid_state_write(sound_t *psid, sid_snapshot_state_t *sid_state)
295
296
    }
296
297
    state.write_pipeline = (cycle_count)sid_state->write_pipeline;
297
298
    state.write_address = (reg8)sid_state->write_address;
 
299
    state.voice_mask = (reg4)sid_state->voice_mask;
298
300
 
299
301
    psid->sid->write_state((const reSID::SID::State)state);
300
302
}