Drop support for AL_SOFT_buffer_samples and AL_SOFT_buffer_sub_data

Unfortunately they conflict with AL_EXT_SOURCE_RADIUS, as AL_SOURCE_RADIUS and
AL_BYTE_RW_OFFSETS_SOFT share the same source property value. A replacement for
AL_SOFT_buffer_samples will eventually be made.

2 files changed, 3 insertions, 61 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 77522ec4..12fc782f 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -272,13 +272,6 @@ static const ALCfunction alcFunctions[] = {
     DECL(alGetAuxiliaryEffectSlotf),
     DECL(alGetAuxiliaryEffectSlotfv),
 
-    DECL(alBufferSubDataSOFT),
-
-    DECL(alBufferSamplesSOFT),
-    DECL(alBufferSubSamplesSOFT),
-    DECL(alGetBufferSamplesSOFT),
-    DECL(alIsBufferFormatSupportedSOFT),
-
     DECL(alDeferUpdatesSOFT),
     DECL(alProcessUpdatesSOFT),
 
@@ -391,9 +384,7 @@ static const ALCenums enumeration[] = {
     DECL(AL_MAX_DISTANCE),
     DECL(AL_SEC_OFFSET),
     DECL(AL_SAMPLE_OFFSET),
-    DECL(AL_SAMPLE_RW_OFFSETS_SOFT),
     DECL(AL_BYTE_OFFSET),
-    DECL(AL_BYTE_RW_OFFSETS_SOFT),
     DECL(AL_SOURCE_TYPE),
     DECL(AL_STATIC),
     DECL(AL_STREAMING),
@@ -713,9 +704,9 @@ static const ALchar alExtList[] =
     "AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS "
     "AL_EXT_MULAW AL_EXT_MULAW_BFORMAT AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET "
     "AL_EXT_source_distance_model AL_EXT_STEREO_ANGLES AL_LOKI_quadriphonic "
-    "AL_SOFT_block_alignment AL_SOFT_buffer_samples AL_SOFT_buffer_sub_data "
-    "AL_SOFT_deferred_updates AL_SOFT_direct_channels AL_SOFT_loop_points "
-    "AL_SOFT_MSADPCM AL_SOFT_source_latency AL_SOFT_source_length";
+    "AL_SOFT_block_alignment AL_SOFT_deferred_updates AL_SOFT_direct_channels "
+    "AL_SOFT_loop_points AL_SOFT_MSADPCM AL_SOFT_source_latency "
+    "AL_SOFT_source_length";
 
 static ATOMIC(ALCenum) LastNullDeviceError = ATOMIC_INIT_STATIC(ALC_NO_ERROR);
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 03eae080..43b935fa 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -97,10 +97,6 @@ typedef enum SourceProp {
     srcSampleLengthSOFT = AL_SAMPLE_LENGTH_SOFT,
     srcSecLengthSOFT = AL_SEC_LENGTH_SOFT,
 
-    /* AL_SOFT_buffer_sub_data / AL_SOFT_buffer_samples */
-    srcSampleRWOffsetsSOFT = AL_SAMPLE_RW_OFFSETS_SOFT,
-    srcByteRWOffsetsSOFT = AL_BYTE_RW_OFFSETS_SOFT,
-
     /* AL_SOFT_source_latency */
     srcSampleOffsetLatencySOFT = AL_SAMPLE_OFFSET_LATENCY_SOFT,
     srcSecOffsetLatencySOFT = AL_SEC_OFFSET_LATENCY_SOFT,
@@ -159,8 +155,6 @@ static ALint FloatValsByProp(ALenum prop)
         case AL_SEC_LENGTH_SOFT:
             return 1;
 
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
         case AL_STEREO_ANGLES:
             return 2;
 
@@ -223,8 +217,6 @@ static ALint DoubleValsByProp(ALenum prop)
         case AL_SEC_LENGTH_SOFT:
             return 1;
 
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
         case AL_SEC_OFFSET_LATENCY_SOFT:
         case AL_STEREO_ANGLES:
             return 2;
@@ -288,10 +280,6 @@ static ALint IntValsByProp(ALenum prop)
         case AL_SEC_LENGTH_SOFT:
             return 1;
 
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
-            return 2;
-
         case AL_POSITION:
         case AL_VELOCITY:
         case AL_DIRECTION:
@@ -351,8 +339,6 @@ static ALint Int64ValsByProp(ALenum prop)
         case AL_SEC_LENGTH_SOFT:
             return 1;
 
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
         case AL_SAMPLE_OFFSET_LATENCY_SOFT:
             return 2;
 
@@ -385,8 +371,6 @@ static ALboolean SetSourcefv(ALsource *Source, ALCcontext *Context, SourceProp p
 
     switch(prop)
     {
-        case AL_BYTE_RW_OFFSETS_SOFT:
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
         case AL_BYTE_LENGTH_SOFT:
         case AL_SAMPLE_LENGTH_SOFT:
         case AL_SEC_LENGTH_SOFT:
@@ -615,8 +599,6 @@ static ALboolean SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p
         case AL_SOURCE_TYPE:
         case AL_BUFFERS_QUEUED:
         case AL_BUFFERS_PROCESSED:
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
         case AL_BYTE_LENGTH_SOFT:
         case AL_SAMPLE_LENGTH_SOFT:
         case AL_SEC_LENGTH_SOFT:
@@ -870,8 +852,6 @@ static ALboolean SetSourcei64v(ALsource *Source, ALCcontext *Context, SourceProp
         case AL_BUFFERS_QUEUED:
         case AL_BUFFERS_PROCESSED:
         case AL_SOURCE_STATE:
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
         case AL_SAMPLE_OFFSET_LATENCY_SOFT:
         case AL_BYTE_LENGTH_SOFT:
         case AL_SAMPLE_LENGTH_SOFT:
@@ -969,7 +949,6 @@ static ALboolean GetSourcedv(ALsource *Source, ALCcontext *Context, SourceProp p
     ALCdevice *device = Context->Device;
     ALbufferlistitem *BufferList;
     ALdouble offsets[2];
-    ALdouble updateLen;
     ALint ivals[3];
     ALboolean err;
 
@@ -1061,14 +1040,6 @@ static ALboolean GetSourcedv(ALsource *Source, ALCcontext *Context, SourceProp p
             ReadUnlock(&Source->queue_lock);
             return AL_TRUE;
 
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
-            LockContext(Context);
-            updateLen = (ALdouble)device->UpdateSize / device->Frequency;
-            GetSourceOffsets(Source, prop, values, updateLen);
-            UnlockContext(Context);
-            return AL_TRUE;
-
         case AL_SEC_OFFSET_LATENCY_SOFT:
             LockContext(Context);
             values[0] = GetSourceSecOffset(Source);
@@ -1316,16 +1287,6 @@ static ALboolean GetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p
                 *values = (ALint)dvals[0];
             return err;
 
-        /* 2x float/double */
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
-            if((err=GetSourcedv(Source, Context, prop, dvals)) != AL_FALSE)
-            {
-                values[0] = (ALint)dvals[0];
-                values[1] = (ALint)dvals[1];
-            }
-            return err;
-
         /* 3x float/double */
         case AL_POSITION:
         case AL_VELOCITY:
@@ -1406,16 +1367,6 @@ static ALboolean GetSourcei64v(ALsource *Source, ALCcontext *Context, SourceProp
                 *values = (ALint64)dvals[0];
             return err;
 
-        /* 2x float/double */
-        case AL_SAMPLE_RW_OFFSETS_SOFT:
-        case AL_BYTE_RW_OFFSETS_SOFT:
-            if((err=GetSourcedv(Source, Context, prop, dvals)) != AL_FALSE)
-            {
-                values[0] = (ALint64)dvals[0];
-                values[1] = (ALint64)dvals[1];
-            }
-            return err;
-
         /* 3x float/double */
         case AL_POSITION:
         case AL_VELOCITY: