Compare commits

..

No commits in common. "471fc2f7259a7c84055de06bb13b2de693a896ee" and "6211ff6ef468a266b1964568e91421e85c0a430b" have entirely different histories.

3 changed files with 10 additions and 8 deletions

View file

@ -247,11 +247,14 @@ static BOOL consentLastEnabled = NO;
if(results && [results count] > 0) { if(results && [results count] > 0) {
PlaylistEntry *pe = results[0]; PlaylistEntry *pe = results[0];
// Select this track
[playlistView selectRowIndexes:[NSIndexSet indexSetWithIndex:pe.index] byExtendingSelection:NO];
if([[NSUserDefaults standardUserDefaults] boolForKey:@"resumePlaybackOnStartup"]) { if([[NSUserDefaults standardUserDefaults] boolForKey:@"resumePlaybackOnStartup"]) {
// And play it
[playbackController playEntryAtIndex:pe.index startPaused:(lastStatus == CogStatusPaused) andSeekTo:@(pe.currentPosition)]; [playbackController playEntryAtIndex:pe.index startPaused:(lastStatus == CogStatusPaused) andSeekTo:@(pe.currentPosition)];
} else {
pe.current = NO;
pe.stopAfter = NO;
pe.currentPosition = 0.0;
pe.countAdded = NO;
[playlistController commitPersistentStore];
} }
// Bug fix // Bug fix
if([results count] > 1) { if([results count] > 1) {
@ -259,7 +262,6 @@ static BOOL consentLastEnabled = NO;
PlaylistEntry *pe = results[i]; PlaylistEntry *pe = results[i];
[pe setCurrent:NO]; [pe setCurrent:NO];
} }
[playlistController commitPersistentStore];
} }
} }
} }

View file

@ -6,8 +6,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/getsentry/sentry-cocoa.git", "location" : "https://github.com/getsentry/sentry-cocoa.git",
"state" : { "state" : {
"revision" : "ca92efeb24b10052cd2a79e5205f42c5a16770ec", "revision" : "56fb914f14922efeda6c744c0125696552b6d2b5",
"version" : "8.53.2" "version" : "8.53.1"
} }
} }
], ],

View file

@ -104,7 +104,7 @@ namespace Organya {
auto& c = carrier, &f = frequency, &a = amplitude; auto& c = carrier, &f = frequency, &a = amplitude;
double mainpos = c.offset, maindelta = 256*c.pitch/nsamples; double mainpos = c.offset, maindelta = 256*c.pitch/nsamples;
for(size_t i=0; i<result.size(); ++i) { for(size_t i=0; i<result.size(); ++i) {
auto s = [this,i](double p=1) { return 256*p*i/nsamples; }; auto s = [=](double p=1) { return 256*p*i/nsamples; };
// Take sample from each of the three signal generators: // Take sample from each of the three signal generators:
int freqval = f.wave[0xFF & int(f.offset + s(f.pitch))] * f.level; int freqval = f.wave[0xFF & int(f.offset + s(f.pitch))] * f.level;
int ampval = a.wave[0xFF & int(a.offset + s(a.pitch))] * a.level; int ampval = a.wave[0xFF & int(a.offset + s(a.pitch))] * a.level;
@ -121,7 +121,7 @@ namespace Organya {
void Load(FILE* fp) { // Load PXT file from disk and initialize synthesizer. void Load(FILE* fp) { // Load PXT file from disk and initialize synthesizer.
/* C++11 simplifies things by a great deal. */ /* C++11 simplifies things by a great deal. */
/* This function would be a lot more complex without it. */ /* This function would be a lot more complex without it. */
auto f = [fp](){ return (int) fgetv(fp); }; auto f = [=](){ return (int) fgetv(fp); };
for(auto&c: channels) for(auto&c: channels)
c = { f() != 0, f(), // enabled, length c = { f() != 0, f(), // enabled, length
{ Waveforms[f()%6], fgetv(fp), f(), f() }, // carrier wave { Waveforms[f()%6], fgetv(fp), f(), f() }, // carrier wave