X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=8a70eb310a19ee145db17f2a0b2ec799d74de838;hb=8b47d5a797a7e8dda7c40db634cf29ff040e3d73;hp=60e594c4149033d1c26f36aebf2a364a873d23f2;hpb=4ed8eacd2e56a59b95fad64477caa52f574e941a;p=vlc

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 60e594c414..8a70eb310a 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -111,24 +111,16 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
     switch (fmt->i_format)
     {
 #ifdef AFMT_FLOAT
-        case VLC_CODEC_F64B:
-        case VLC_CODEC_F64L:
-        case VLC_CODEC_F32B:
-        case VLC_CODEC_F32L:
+        case VLC_CODEC_FL64:
+        case VLC_CODEC_FL32:
             format = AFMT_FLOAT;
             break;
 #endif
-        case VLC_CODEC_S32B:
-            format = AFMT_S32_BE;
+        case VLC_CODEC_S32N:
+            format = AFMT_S32_NE;
             break;
-        case VLC_CODEC_S32L:
-            format = AFMT_S32_LE;
-            break;
-        case VLC_CODEC_S16B:
-            format = AFMT_S16_BE;
-            break;
-        case VLC_CODEC_S16L:
-            format = AFMT_S16_LE;
+        case VLC_CODEC_S16N:
+            format = AFMT_S16_NE;
             break;
         case VLC_CODEC_U8:
             format = AFMT_U8;
@@ -155,12 +147,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
     switch (format)
     {
         case AFMT_U8:     fmt->i_format = VLC_CODEC_U8;   break;
-        case AFMT_S16_BE: fmt->i_format = VLC_CODEC_S16B; break;
-        case AFMT_S16_LE: fmt->i_format = VLC_CODEC_S16L; break;
-        //case AFMT_S24_BE:
-        //case AFMT_S24_LE:
-        case AFMT_S32_BE: fmt->i_format = VLC_CODEC_S32B; break;
-        case AFMT_S32_LE: fmt->i_format = VLC_CODEC_S32L; break;
+        case AFMT_S16_NE: fmt->i_format = VLC_CODEC_S16N; break;
+        case AFMT_S32_NE: fmt->i_format = VLC_CODEC_S32N; break;
 #ifdef AFMT_FLOAT
         case AFMT_FLOAT:  fmt->i_format = VLC_CODEC_FL32; break;
 #endif
@@ -370,7 +358,7 @@ static int MuteSet (audio_output_t *aout, bool mute)
 
 static int DevicesEnum (audio_output_t *aout, char ***idp, char ***namep)
 {
-    aout_sys_t *sys = sys;
+    aout_sys_t *sys = aout->sys;
     int fd = sys->fd;
     oss_sysinfo si;