kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'xcode7beta'

CQTexperiment
Chris Moeller 2015-11-12 21:37:10 -08:00
parent 2d4d5f2d95 ae3d45cf45
commit d7ea8402db
61 changed files with 917 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Audio/CogAudio.xcodeproj/project.pbxproj
View File

@ -447,6 +447,7 @@
OTHER_LDFLAGS = "";
PRODUCT_NAME = CogAudio;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WARNING_LDFLAGS = "";
WRAPPER_EXTENSION = framework;
@ -471,6 +472,7 @@
OTHER_LDFLAGS = "";
PRODUCT_NAME = CogAudio;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WARNING_LDFLAGS = "";
WRAPPER_EXTENSION = framework;

2
Cog.xcodeproj/project.pbxproj
View File

@ -2766,6 +2766,7 @@
dynamic_lookup,
);
PRODUCT_NAME = Cog;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
@ -2801,6 +2802,7 @@
dynamic_lookup,
);
PRODUCT_NAME = Cog;
SDKROOT = macosx;
WRAPPER_EXTENSION = app;
};
name = Release;

2
Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj
View File

@ -641,6 +641,7 @@
OBJROOT = ../../build;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = Dumb;
SDKROOT = macosx;
SHARED_PRECOMPS_DIR = "";
SKIP_INSTALL = YES;
SYMROOT = ../../build;
@ -665,6 +666,7 @@
OBJROOT = ../../build;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = Dumb;
SDKROOT = macosx;
SHARED_PRECOMPS_DIR = "";
SKIP_INSTALL = YES;
SYMROOT = ../../build;

2
Frameworks/FFMPEG/FFMPEG.xcodeproj/project.pbxproj
View File

@ -2062,6 +2062,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = FFMPEG;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = framework;
@ -2086,6 +2087,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = FFMPEG;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = framework;

2
Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj
View File

@ -816,6 +816,7 @@
INFOPLIST_FILE = "File_Extractor/File_Extractor-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -837,6 +838,7 @@
INFOPLIST_FILE = "File_Extractor/File_Extractor-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/GME/GME.xcodeproj/project.pbxproj
View File

@ -1276,6 +1276,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = GME;
SDKROOT = macosx;
SHARED_PRECOMPS_DIR = "";
SKIP_INSTALL = YES;
SYMROOT = ../../build;
@ -1305,6 +1306,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = GME;
SDKROOT = macosx;
SHARED_PRECOMPS_DIR = "";
SKIP_INSTALL = YES;
SYMROOT = ../../build;

2
Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj
View File

@ -381,6 +381,7 @@
INFOPLIST_FILE = "HighlyAdvanced/HighlyAdvanced-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -398,6 +399,7 @@
INFOPLIST_FILE = "HighlyAdvanced/HighlyAdvanced-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj
View File

@ -267,7 +267,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
@ -299,7 +298,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
};
name = Release;
};

2
Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj
View File

@ -341,6 +341,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -358,6 +359,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj
View File

@ -262,6 +262,7 @@
INFOPLIST_FILE = "HivelyPlayer/HivelyPlayer-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@ -277,6 +278,7 @@
INFOPLIST_FILE = "HivelyPlayer/HivelyPlayer-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Release;

2
Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj
View File

@ -310,6 +310,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = mpcdec;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
ZERO_LINK = YES;
@ -330,6 +331,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = mpcdec;
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = Files/include/;
WRAPPER_EXTENSION = framework;

2
Frameworks/NDHotKey/NDHotKey.xcodeproj/project.pbxproj
View File

@ -282,6 +282,7 @@
INFOPLIST_FILE = "NDHotKey/NDHotKey-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -299,6 +300,7 @@
INFOPLIST_FILE = "NDHotKey/NDHotKey-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/Opus/Opus.xcodeproj/project.pbxproj
View File

@ -1196,6 +1196,7 @@
Ogg,
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -1229,6 +1230,7 @@
Ogg,
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj
View File

@ -381,6 +381,7 @@
INFOPLIST_FILE = "SSEQPlayer/SSEQPlayer-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -396,6 +397,7 @@
INFOPLIST_FILE = "SSEQPlayer/SSEQPlayer-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj
View File

@ -249,6 +249,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = Shorten;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
ZERO_LINK = YES;
@ -271,6 +272,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
OTHER_CFLAGS = "-DHAVE_CONFIG_H";
PRODUCT_NAME = Shorten;
SDKROOT = macosx;
SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders";
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = Files/shorten/include;

2
Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj
View File

@ -1051,6 +1051,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = TagLib;
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
ZERO_LINK = YES;
};
@ -1073,6 +1074,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = TagLib;
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Release;

4
Frameworks/Vorbis/macosx/VorbisNoDot.xcodeproj/project.pbxproj
View File

@ -756,7 +756,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_LDFLAGS = "";
PRODUCT_NAME = Vorbis;
SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@ -789,7 +788,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_LDFLAGS = "";
PRODUCT_NAME = Vorbis;
SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@ -806,7 +804,6 @@
buildSettings = {
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
};
name = Debug;
};
@ -823,7 +820,6 @@
"$(OTHER_CFLAGS)",
"-ffast-math",
);
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
};
name = Release;
};

2
Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
View File

@ -301,6 +301,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = WavPack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
ZERO_LINK = YES;
@ -334,6 +335,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = WavPack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/lazyusf/lazyusf.xcodeproj/project.pbxproj
View File

@ -1159,6 +1159,7 @@
INFOPLIST_FILE = "lazyusf/lazyusf-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = lazyusf;
WRAPPER_EXTENSION = framework;
@ -1183,6 +1184,7 @@
INFOPLIST_FILE = "lazyusf/lazyusf-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = lazyusf;
WRAPPER_EXTENSION = framework;

2
Frameworks/libsidplay/sidplayfp.xcodeproj/project.pbxproj
View File

@ -1099,6 +1099,7 @@
INFOPLIST_FILE = libsidplay/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = sidplayfp;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
@ -1115,6 +1116,7 @@
INFOPLIST_FILE = libsidplay/Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = sidplayfp;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;

2
Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj
View File

@ -301,6 +301,7 @@
INFOPLIST_FILE = "midi_processing/midi_processing-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -316,6 +317,7 @@
INFOPLIST_FILE = "midi_processing/midi_processing-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/modplay/modplay.xcodeproj/project.pbxproj
View File

@ -287,6 +287,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "modplay/modplay-Info.plist";
PRODUCT_NAME = modplay;
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@ -301,6 +302,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "modplay/modplay-Info.plist";
PRODUCT_NAME = modplay;
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Release;

537
Frameworks/modplay/modplay/ft2play.c
View File

File diff suppressed because it is too large Load Diff

5
Frameworks/modplay/modplay/resampler.c
View File

@ -303,6 +303,11 @@ static int resampler_output_delay(resampler *r)
}
}
int resampler_get_padding_size()
{
return SINC_WIDTH - 1;
}
int resampler_ready(void *_r)
{
resampler * r = ( resampler * ) _r;

3
Frameworks/modplay/modplay/resampler.h
View File

@ -3,7 +3,6 @@
#define RESAMPLER_DECORATE modplay
// Ugglay
#ifdef RESAMPLER_DECORATE
#define PASTE(a,b) a ## b
#define EVALUATE(a,b) PASTE(a,b)
@ -14,6 +13,7 @@
#define resampler_dup_inplace EVALUATE(RESAMPLER_DECORATE,_resampler_dup_inplace)
#define resampler_set_quality EVALUATE(RESAMPLER_DECORATE,_resampler_set_quality)
#define resampler_get_free_count EVALUATE(RESAMPLER_DECORATE,_resampler_get_free_count)
#define resampler_get_padding_size EVALUATE(RESAMPLER_DECORATE,_resampler_get_padding_size)
#define resampler_write_sample EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample)
#define resampler_write_sample_fixed EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample_fixed)
#define resampler_set_rate EVALUATE(RESAMPLER_DECORATE,_resampler_set_rate)
@ -47,6 +47,7 @@ enum
void resampler_set_quality(void *, int quality);
int resampler_get_free_count(void *);
int resampler_get_padding_size();
void resampler_write_sample(void *, short sample);
void resampler_write_sample_fixed(void *, int sample, unsigned char depth);
void resampler_set_rate( void *, double new_factor );

809
Frameworks/modplay/modplay/st3play.c
View File

File diff suppressed because it is too large Load Diff

2
Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj
View File

@ -429,7 +429,6 @@
INSTALL_PATH = "@loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
@ -463,7 +462,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = "@loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;

2
Frameworks/playptmod/playptmod.xcodeproj/project.pbxproj
View File

@ -261,6 +261,7 @@
INFOPLIST_FILE = "playptmod/playptmod-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -276,6 +277,7 @@
INFOPLIST_FILE = "playptmod/playptmod-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

83
Frameworks/playptmod/playptmod/playptmod.c
View File

@ -1,8 +1,14 @@
/*
** PLAYPTMOD v1.25 - 20th of April 2015 - http://16-bits.org
** =========================================================
** PLAYPTMOD v1.27 - 8th of October 2015 - http://16-bits.org
** ==========================================================
** This is the foobar2000 version, with added code by kode54
**
** Changelog from 1.26:
** - Only loop module if speed is zero after fully processing an entire row
**
** Changelog from 1.25:
** - Invert Loop (EFx) was inaccurate
**
** Changelog from 1.24:
** - Sample swaps are now only handled for PT MODs
** - Handle sample swapping even during note delay (EDx)
@ -623,7 +629,7 @@ static void outputAudio(player *p, int *target, int numSamples)
{
tempVolume = (v->data && !v->mute ? v->vol : 0);
while (interpolating && (resampler_get_free_count(bSmp) ||
while (interpolating > 0 && (resampler_get_free_count(bSmp) ||
(!resampler_get_sample_count(bSmp) &&
!resampler_get_sample_count(bVol))))
{
@ -646,7 +652,7 @@ static void outputAudio(player *p, int *target, int numSamples)
if (!v->newLoopFlag)
{
interpolating = 0;
interpolating = -resampler_get_padding_size();
break;
}
@ -673,7 +679,7 @@ static void outputAudio(player *p, int *target, int numSamples)
if (!v->newLoopFlag)
{
interpolating = 0;
interpolating = -resampler_get_padding_size();
break;
}
@ -688,13 +694,22 @@ static void outputAudio(player *p, int *target, int numSamples)
}
else
{
interpolating = 0;
interpolating = -resampler_get_padding_size();
break;
}
}
}
}
while (interpolating < 0 && (resampler_get_free_count(bSmp) ||
(!resampler_get_sample_count(bSmp) &&
!resampler_get_sample_count(bVol))))
{
resampler_write_sample_fixed(bSmp, 0, 1);
resampler_write_sample_fixed(bVol, 0, 1);
++interpolating;
}
v->interpolating = interpolating;
while (j < numSamples && resampler_get_sample_count(bSmp))
@ -713,7 +728,7 @@ static void outputAudio(player *p, int *target, int numSamples)
j++;
}
if (!interpolating)
if (!interpolating && !resampler_get_sample_count(bSmp))
{
v->data = NULL;
break;
@ -941,7 +956,7 @@ static int playptmod_LoadMTM(player *p, BUF *fmodule)
p->useLEDFilter = false;
p->moduleLoaded = true;
p->minPeriod = 14;
p->maxPeriod = 1712;
@ -1199,7 +1214,7 @@ int playptmod_LoadMem(void *_p, const unsigned char *buf, unsigned long bufLengt
s->attribute = 0;
}
}
/* STK 2.5 had loopStart in words, not bytes. Convert if late version STK */
for (i = 0; i < 15; ++i)
{
@ -1705,15 +1720,14 @@ static void processInvertLoop(player *p, mod_channel *ch)
if (ch->invertLoopSpeed > 0)
{
ch->invertLoopDelay += invertLoopSpeeds[ch->invertLoopSpeed];
if (ch->invertLoopDelay & 128)
if (ch->invertLoopDelay >= 128)
{
ch->invertLoopDelay = 0;
if (ch->invertLoopPtr != NULL) /* PT doesn't do this, but we're more sane than that */
if (ch->invertLoopPtr != NULL) /* SAFETY BUG FIX */
{
ch->invertLoopPtr++;
if (ch->invertLoopPtr >= (ch->invertLoopStart + ch->invertLoopLength))
ch->invertLoopPtr = ch->invertLoopStart;
if (++ch->invertLoopPtr >= (ch->invertLoopStart + ch->invertLoopLength))
ch->invertLoopPtr = ch->invertLoopStart;
*ch->invertLoopPtr = -1 - *ch->invertLoopPtr;
}
@ -2362,7 +2376,7 @@ static void fxTremolo(player *p, mod_channel *ch)
if (loNybble > 0)
ch->tremoloDepth = loNybble;
}
processTremolo(p, ch);
}
@ -2494,26 +2508,17 @@ static void fxSetTempo(player *p, mod_channel *ch)
{
if (p->modTick == 0)
{
if (ch->param > 0)
{
if ((ch->param < 32) || p->vBlankTiming)
modSetSpeed(p, ch->param);
else
modSetTempo(p, ch->param);
}
if ((ch->param < 32) || p->vBlankTiming)
modSetSpeed(p, ch->param);
else
{
/* Bit of a hack, will alert caller that song has restarted */
p->modOrder = p->source->head.clippedRestartPos;
p->PBreakPosition = 0;
p->PosJumpAssert = true;
}
modSetTempo(p, ch->param);
}
}
static void processEffects(player *p, mod_channel *ch)
{
processInvertLoop(p, ch);
if (p->modTick > 0)
processInvertLoop(p, ch);
if ((!ch->command && !ch->param) == 0)
{
@ -2622,7 +2627,7 @@ static void fetchPatternData(player *p, mod_channel *ch)
ch->tempPeriod = (p->minPeriod == PT_MIN_PERIOD) ? rawAmigaPeriods[(ch->fineTune * ((12 * 3) + 1)) + tempNote] : extendedRawPeriods[(ch->fineTune * ((12 * 7) + 1)) + tempNote];
ch->flags |= FLAG_NOTE;
}
/* do a slightly different path for 3xx/5xy in PT mode */
if (p->minPeriod == PT_MIN_PERIOD)
{
@ -2680,7 +2685,7 @@ static void processChannel(player *p, mod_channel *ch)
ch->invertLoopPtr = &p->source->sampleData[s->offset + s->loopStart];
ch->invertLoopStart = ch->invertLoopPtr;
ch->invertLoopLength = s->loopLength;
if ((ch->command != 0x03) && (ch->command != 0x05))
{
ch->offset = 0;
@ -2805,6 +2810,18 @@ static void processTick(player *p)
p->forceEffectsOff = true;
}
/* Only process speed 0 effect after processing entire row */
if (p->modSpeed == 0)
{
/* Bit of a hack, will alert code below of a full repeat */
p->modOrder = p->source->head.clippedRestartPos;
modSetSpeed(p, 6);
p->modTick = 6; /* cause instant repeat */
p->PBreakPosition = 0;
p->PosJumpAssert = true;
}
p->modTick++;
if (p->modTick >= p->modSpeed)
{
@ -3046,7 +3063,7 @@ void playptmod_Free(void *_p)
free(p->source);
p->source = NULL;
}
p->moduleLoaded = false;
}
@ -3085,7 +3102,7 @@ void playptmod_Free(void *_p)
resampler_delete(p->blep[i]);
resampler_delete(p->blepVol[i]);
}
free(p);
}

25
Frameworks/playptmod/playptmod/resampler.c
View File

@ -8,11 +8,13 @@
#endif
#ifdef __APPLE__
#include <TargetConditionals.h>
#if TARGET_CPU_ARM
#include <arm_neon.h>
#if TARGET_CPU_ARM || TARGET_CPU_ARM64
#define RESAMPLER_NEON
#endif
#endif
#ifdef RESAMPLER_NEON
#include <arm_neon.h>
#endif
#ifdef _MSC_VER
#define ALIGNED _declspec(align(16))
@ -301,6 +303,11 @@ static int resampler_output_delay(resampler *r)
}
}
int resampler_get_padding_size()
{
return SINC_WIDTH - 1;
}
int resampler_ready(void *_r)
{
resampler * r = ( resampler * ) _r;
@ -470,7 +477,7 @@ static int resampler_run_blep(resampler * r, float ** out_, float * out_end)
}
last_amp += sample;
sample /= kernel_sum;
for (sample = 0, i = 0; i < SINC_WIDTH * 2; ++i)
for (i = 0; i < SINC_WIDTH * 2; ++i)
out[i] += sample * kernel[i];
}
@ -626,8 +633,8 @@ static int resampler_run_blep(resampler * r, float ** out_, float * out_end)
{
temp1 = vld1q_f32( (const float32_t *)( kernel + i ) );
temp2 = vld1q_f32( (const float32_t *) out + i * 4 );
temp1 = vmlaq_f32( temp2, temp1, samplex );
vst1q_f32( (float32_t *) out + i * 4, temp1 );
temp2 = vmlaq_f32( temp2, temp1, samplex );
vst1q_f32( (float32_t *) out + i * 4, temp2 );
}
}
@ -743,7 +750,7 @@ static int resampler_run_blam(resampler * r, float ** out_, float * out_end)
}
last_amp += sample;
sample /= kernel_sum;
for (sample = 0, i = 0; i < SINC_WIDTH * 2; ++i)
for (i = 0; i < SINC_WIDTH * 2; ++i)
out[i] += sample * kernel[i];
}
@ -908,7 +915,7 @@ static int resampler_run_blam(resampler * r, float ** out_, float * out_end)
sample = in[0];
if (phase_inc < 1.0f)
sample += (in[1] - in[0]) * fphase;
sample += (in[1] - in[0]) * phase;
sample -= last_amp;
if (sample)
@ -935,8 +942,8 @@ static int resampler_run_blam(resampler * r, float ** out_, float * out_end)
{
temp1 = vld1q_f32( (const float32_t *)( kernel + i ) );
temp2 = vld1q_f32( (const float32_t *) out + i * 4 );
temp1 = vmlaq_f32( temp2, temp1, samplex );
vst1q_f32( (float32_t *) out + i * 4, temp1 );
temp2 = vmlaq_f32( temp2, temp1, samplex );
vst1q_f32( (float32_t *) out + i * 4, temp2 );
}
}

5
Frameworks/playptmod/playptmod/resampler.h
View File

@ -1,7 +1,8 @@
#ifndef _RESAMPLER_H_
#define _RESAMPLER_H_
// Ugglay
#define RESAMPLER_DECORATE playptmod
#ifdef RESAMPLER_DECORATE
#define PASTE(a,b) a ## b
#define EVALUATE(a,b) PASTE(a,b)
@ -12,6 +13,7 @@
#define resampler_dup_inplace EVALUATE(RESAMPLER_DECORATE,_resampler_dup_inplace)
#define resampler_set_quality EVALUATE(RESAMPLER_DECORATE,_resampler_set_quality)
#define resampler_get_free_count EVALUATE(RESAMPLER_DECORATE,_resampler_get_free_count)
#define resampler_get_padding_size EVALUATE(RESAMPLER_DECORATE,_resampler_get_padding_size)
#define resampler_write_sample EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample)
#define resampler_write_sample_fixed EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample_fixed)
#define resampler_set_rate EVALUATE(RESAMPLER_DECORATE,_resampler_set_rate)
@ -45,6 +47,7 @@ enum
void resampler_set_quality(void *, int quality);
int resampler_get_free_count(void *);
int resampler_get_padding_size();
void resampler_write_sample(void *, short sample);
void resampler_write_sample_fixed(void *, int sample, unsigned char depth);
void resampler_set_rate( void *, double new_factor );

2
Frameworks/psflib/psflib.xcodeproj/project.pbxproj
View File

@ -268,6 +268,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -286,6 +287,7 @@
INSTALL_PATH = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Frameworks/vgmstream/vgmstream.xcodeproj/project.pbxproj
View File

@ -1831,6 +1831,7 @@
);
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@ -1856,6 +1857,7 @@
);
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Release;

2
Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj
View File

@ -437,6 +437,7 @@
INFOPLIST_FILE = "vio2sf/vio2sf-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
@ -453,6 +454,7 @@
INFOPLIST_FILE = "vio2sf/vio2sf-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};

2
Plugins/APL/APL.xcodeproj/project.pbxproj
View File

@ -232,6 +232,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = APL;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -257,6 +258,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = APL;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = NO;

2
Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj
View File

@ -331,6 +331,7 @@
INFOPLIST_FILE = "ArchiveSource/ArchiveSource-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -346,6 +347,7 @@
INFOPLIST_FILE = "ArchiveSource/ArchiveSource-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/BASSMODS/BASSMODS.xcodeproj/project.pbxproj
View File

@ -313,6 +313,7 @@
"$(PROJECT_DIR)/../../ThirdParty/BASS",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -334,6 +335,7 @@
);
OTHER_CODE_SIGN_FLAGS = "--deep";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj
View File

@ -200,6 +200,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = CoreAudio;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -216,6 +217,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = CoreAudio;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj
View File

@ -231,6 +231,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = CueSheet;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -248,6 +249,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = CueSheet;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/Dumb/Dumb.xcodeproj/project.pbxproj
View File

@ -383,6 +383,7 @@
);
OBJROOT = ../../build;
PRODUCT_NAME = Dumb;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -410,6 +411,7 @@
);
OBJROOT = ../../build;
PRODUCT_NAME = Dumb;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj
View File

@ -279,6 +279,7 @@
"\"$(SRCROOT)/../../Frameworks/FFMPEG/build/Debug/FFMPEG.framework\"",
);
PRODUCT_NAME = FFMPEG;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -301,6 +302,7 @@
INSTALL_PATH = "$(HOME)/Library/Bundles";
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = FFMPEG;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/FileSource/FileSource.xcodeproj/project.pbxproj
View File

@ -259,6 +259,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = FileSource;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -275,6 +276,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = FileSource;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Flac/Flac.xcodeproj/project.pbxproj
View File

@ -266,6 +266,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Flac;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -287,6 +288,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Flac;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/GME/GME.xcodeproj/project.pbxproj
View File

@ -290,6 +290,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = GME;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -307,6 +308,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = GME;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj
View File

@ -227,6 +227,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = HTTPSource;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -245,6 +246,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = HTTPSource;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

73
Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
View File

@ -18,7 +18,6 @@
834379A817F9818400584396 /* HCDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 834379A717F9818400584396 /* HCDecoder.mm */; };
8360EEE817F92AC8005208A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8360EEE717F92AC8005208A4 /* Cocoa.framework */; };
8360EEF217F92AC8005208A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8360EEF017F92AC8005208A4 /* InfoPlist.strings */; };
8360EF6E17F92E86005208A4 /* HighlyExperimental.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8360EF4417F92C92005208A4 /* HighlyExperimental.framework */; };
8384904A180764B500E7332D /* SSEQPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83848FEC1807624000E7332D /* SSEQPlayer.framework */; };
8384904B180764C200E7332D /* SSEQPlayer.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83848FEC1807624000E7332D /* SSEQPlayer.framework */; };
83C8B6FB18AF58FA0071B040 /* lazyusf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83C8B65618AF57770071B040 /* lazyusf.framework */; };
@ -26,17 +25,9 @@
83DE0CBC180B02CC00269051 /* vio2sf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83DE0C3A180A9BD500269051 /* vio2sf.framework */; };
83DE0CBD180B02D800269051 /* vio2sf.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83DE0C3A180A9BD500269051 /* vio2sf.framework */; };
83DE0CC0180B27C200269051 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83DE0CBF180B27C200269051 /* libz.dylib */; };
83F18C3917F9301400471B6C /* HighlyExperimental.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8360EF4417F92C92005208A4 /* HighlyExperimental.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
8343781017F93A6700584396 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8360EF3E17F92C91005208A4 /* HighlyExperimental.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8360EF0F17F92C91005208A4;
remoteInfo = HighlyExperimental;
};
8343784F17F93CB600584396 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8343784A17F93CB500584396 /* psflib.xcodeproj */;
@ -93,13 +84,6 @@
remoteGlobalIDString = 8343793417F97BDB00584396;
remoteInfo = HighlyAdvanced;
};
8360EF4317F92C92005208A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8360EF3E17F92C91005208A4 /* HighlyExperimental.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8360EF1017F92C91005208A4;
remoteInfo = HighlyExperimental;
};
83848FEB1807624000E7332D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83848FE61807623F00E7332D /* SSEQPlayer.xcodeproj */;
@ -135,6 +119,13 @@
remoteGlobalIDString = 83DE0C05180A9BD400269051;
remoteInfo = vio2sf;
};
83FC325D1BF5AB9000962B36 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83FC32591BF5AB9000962B36 /* HighlyExperimental.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8360EF1017F92C91005208A4;
remoteInfo = HighlyExperimental;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@ -160,7 +151,6 @@
8343792A17F96F2600584396 /* HighlyQuixotic.framework in CopyFiles */,
834378D317F9677300584396 /* HighlyTheoretical.framework in CopyFiles */,
8343786017F93DBB00584396 /* psflib.framework in CopyFiles */,
83F18C3917F9301400471B6C /* HighlyExperimental.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -171,7 +161,6 @@
8343780B17F932B600584396 /* HCDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCDecoder.h; sourceTree = "<group>"; };
8343780E17F932C900584396 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = "<group>"; };
8343784A17F93CB500584396 /* psflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = psflib.xcodeproj; path = ../../Frameworks/psflib/psflib.xcodeproj; sourceTree = "<group>"; };
8343786117F944BD00584396 /* hebios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hebios.h; sourceTree = "<group>"; };
8343789C17F9658E00584396 /* HighlyTheoretical.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyTheoretical.xcodeproj; path = ../../Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj; sourceTree = "<group>"; };
8343790C17F96E2600584396 /* HighlyQuixotic.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyQuixotic.xcodeproj; path = ../../Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj; sourceTree = "<group>"; };
8343796317F97BDB00584396 /* HighlyAdvanced.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyAdvanced.xcodeproj; path = ../../Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj; sourceTree = "<group>"; };
@ -184,12 +173,12 @@
8360EEEF17F92AC8005208A4 /* HighlyComplete-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HighlyComplete-Info.plist"; sourceTree = "<group>"; };
8360EEF117F92AC8005208A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
8360EEF317F92AC8005208A4 /* HighlyComplete-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "HighlyComplete-Prefix.pch"; sourceTree = "<group>"; };
8360EF3E17F92C91005208A4 /* HighlyExperimental.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyExperimental.xcodeproj; path = ../../Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj; sourceTree = "<group>"; };
83848FE61807623F00E7332D /* SSEQPlayer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SSEQPlayer.xcodeproj; path = ../../Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj; sourceTree = "<group>"; };
83C8B65018AF57770071B040 /* lazyusf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lazyusf.xcodeproj; path = ../../Frameworks/lazyusf/lazyusf.xcodeproj; sourceTree = "<group>"; };
83DE0C34180A9BD400269051 /* vio2sf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = vio2sf.xcodeproj; path = ../../Frameworks/vio2sf/vio2sf.xcodeproj; sourceTree = "<group>"; };
83DE0CBF180B27C200269051 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
83FAF8A318ADD27F00057CAF /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
83FC32591BF5AB9000962B36 /* HighlyExperimental.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyExperimental.xcodeproj; path = ../../Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -205,7 +194,6 @@
8343792917F96F1D00584396 /* HighlyQuixotic.framework in Frameworks */,
834378D217F9676600584396 /* HighlyTheoretical.framework in Frameworks */,
8343785F17F93DAB00584396 /* psflib.framework in Frameworks */,
8360EF6E17F92E86005208A4 /* HighlyExperimental.framework in Frameworks */,
8360EEE817F92AC8005208A4 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -265,10 +253,10 @@
8360EEE617F92AC8005208A4 /* Frameworks */ = {
isa = PBXGroup;
children = (
83FC32591BF5AB9000962B36 /* HighlyExperimental.xcodeproj */,
83DE0CBF180B27C200269051 /* libz.dylib */,
8360EEE717F92AC8005208A4 /* Cocoa.framework */,
8360EEE917F92AC8005208A4 /* Other Frameworks */,
8360EF3E17F92C91005208A4 /* HighlyExperimental.xcodeproj */,
8343784A17F93CB500584396 /* psflib.xcodeproj */,
8343789C17F9658E00584396 /* HighlyTheoretical.xcodeproj */,
8343790C17F96E2600584396 /* HighlyQuixotic.xcodeproj */,
@ -296,7 +284,6 @@
83FAF8A318ADD27F00057CAF /* PlaylistController.h */,
8324C584181513A10046F78F /* circular_buffer.h */,
834379A717F9818400584396 /* HCDecoder.mm */,
8343786117F944BD00584396 /* hebios.h */,
8343780E17F932C900584396 /* Plugin.h */,
8343780B17F932B600584396 /* HCDecoder.h */,
8360EEEE17F92AC8005208A4 /* Supporting Files */,
@ -314,14 +301,6 @@
name = "Supporting Files";
sourceTree = "<group>";
};
8360EF3F17F92C91005208A4 /* Products */ = {
isa = PBXGroup;
children = (
8360EF4417F92C92005208A4 /* HighlyExperimental.framework */,
);
name = Products;
sourceTree = "<group>";
};
83848FE71807623F00E7332D /* Products */ = {
isa = PBXGroup;
children = (
@ -346,6 +325,14 @@
name = Products;
sourceTree = "<group>";
};
83FC325A1BF5AB9000962B36 /* Products */ = {
isa = PBXGroup;
children = (
83FC325E1BF5AB9000962B36 /* HighlyExperimental.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -368,7 +355,6 @@
8343792817F96F1900584396 /* PBXTargetDependency */,
834378D117F9675E00584396 /* PBXTargetDependency */,
8343785E17F93D9D00584396 /* PBXTargetDependency */,
8343781117F93A6700584396 /* PBXTargetDependency */,
);
name = HighlyComplete;
productName = HighlyComplete;
@ -400,8 +386,8 @@
ProjectRef = 8343796317F97BDB00584396 /* HighlyAdvanced.xcodeproj */;
},
{
ProductGroup = 8360EF3F17F92C91005208A4 /* Products */;
ProjectRef = 8360EF3E17F92C91005208A4 /* HighlyExperimental.xcodeproj */;
ProductGroup = 83FC325A1BF5AB9000962B36 /* Products */;
ProjectRef = 83FC32591BF5AB9000962B36 /* HighlyExperimental.xcodeproj */;
},
{
ProductGroup = 8343790D17F96E2600584396 /* Products */;
@ -464,13 +450,6 @@
remoteRef = 8343796817F97BDB00584396 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8360EF4417F92C92005208A4 /* HighlyExperimental.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = HighlyExperimental.framework;
remoteRef = 8360EF4317F92C92005208A4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
83848FEC1807624000E7332D /* SSEQPlayer.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
@ -492,6 +471,13 @@
remoteRef = 83DE0C39180A9BD500269051 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
83FC325E1BF5AB9000962B36 /* HighlyExperimental.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = HighlyExperimental.framework;
remoteRef = 83FC325D1BF5AB9000962B36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@ -517,11 +503,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
8343781117F93A6700584396 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = HighlyExperimental;
targetProxy = 8343781017F93A6700584396 /* PBXContainerItemProxy */;
};
8343785E17F93D9D00584396 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = psflib;
@ -649,6 +630,7 @@
);
INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -667,6 +649,7 @@
);
INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Hively/Hively.xcodeproj/project.pbxproj
View File

@ -337,6 +337,7 @@
INFOPLIST_FILE = "Hively/Hively-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = bundle;
};
name = Debug;
@ -351,6 +352,7 @@
INFOPLIST_FILE = "Hively/Hively-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = bundle;
};
name = Release;

2
Plugins/M3u/M3u.xcodeproj/project.pbxproj
View File

@ -208,6 +208,7 @@
INSTALL_PATH = "$(HOME)/Library/Bundles";
OBJROOT = ../../build;
PRODUCT_NAME = M3u;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -226,6 +227,7 @@
INSTALL_PATH = "$(HOME)/Library/Bundles";
OBJROOT = ../../build;
PRODUCT_NAME = M3u;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
View File

@ -392,6 +392,7 @@
"$(PROJECT_DIR)/../../ThirdParty/BASS",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -410,6 +411,7 @@
"$(PROJECT_DIR)/../../ThirdParty/BASS",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Musepack/Musepack.xcodeproj/project.pbxproj
View File

@ -267,6 +267,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Musepack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -289,6 +290,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Musepack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Opus/Opus.xcodeproj/project.pbxproj
View File

@ -331,6 +331,7 @@
INFOPLIST_FILE = "Opus/Opus-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -352,6 +353,7 @@
INFOPLIST_FILE = "Opus/Opus-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Pls/Pls.xcodeproj/project.pbxproj
View File

@ -207,6 +207,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Pls;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;
@ -224,6 +225,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Pls;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SYMROOT = ../../build;
WRAPPER_EXTENSION = bundle;

2
Plugins/Shorten/Shorten.xcodeproj/project.pbxproj
View File

@ -264,6 +264,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Shorten;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -285,6 +286,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = Shorten;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj
View File

@ -229,6 +229,7 @@
INFOPLIST_FILE = SilenceDecoder/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -243,6 +244,7 @@
INFOPLIST_FILE = SilenceDecoder/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/TagLib/TagLib.xcodeproj/project.pbxproj
View File

@ -286,6 +286,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = TagLib;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -308,6 +309,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = TagLib;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj
View File

@ -324,6 +324,7 @@
ogg,
);
PRODUCT_NAME = Vorbis;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -359,6 +360,7 @@
ogg,
);
PRODUCT_NAME = Vorbis;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/WavPack/WavPack.xcodeproj/project.pbxproj
View File

@ -268,6 +268,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = WavPack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@ -291,6 +292,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Bundles";
PRODUCT_NAME = WavPack;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/modplay/modplay.xcodeproj/project.pbxproj
View File

@ -340,7 +340,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
@ -373,7 +372,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;

2
Plugins/playptmod/playptmod.xcodeproj/project.pbxproj
View File

@ -328,6 +328,7 @@
INFOPLIST_FILE = "playptmod/playptmod-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = bundle;
};
name = Debug;
@ -341,6 +342,7 @@
INFOPLIST_FILE = "playptmod/playptmod-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
WRAPPER_EXTENSION = bundle;
};
name = Release;

2
Plugins/sidplay/sidplay.xcodeproj/project.pbxproj
View File

@ -318,6 +318,7 @@
INFOPLIST_FILE = sidplay/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -332,6 +333,7 @@
INFOPLIST_FILE = sidplay/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};

2
Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj
View File

@ -324,6 +324,7 @@
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
@ -346,6 +347,7 @@
INFOPLIST_FILE = "vgmstream/vgmstream-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};