making mp3*~ work on windows

svn path=/trunk/externals/unauthorized/; revision=1755

3 files changed, 20 insertions, 144 deletions

diff --git a/mp3live~/mp3fileout~.c b/mp3live~/mp3fileout~.c
index 3782c7e..0559a75 100644
--- a/mp3live~/mp3fileout~.c
+++ b/mp3live~/mp3fileout~.c
@@ -47,18 +47,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
-#include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
-#include "interface.h"   /* mpglib decoding library from lame 3.92 */
 #define SOCKET_ERROR -1
 #else
 #include <winsock.h>
+#include <io.h>
+#include <fcntl.h>
+#define  MSG_NOSIGNAL 0
 #endif
-
-#ifdef NT
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
-#endif
+#include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
+#include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
+#include "interface.h"   /* mpglib decoding library from lame 3.92 */
 
 #define INPUT_BUFFER_SIZE 32768
 #define OUTPUT_BUFFER_SIZE 32768
@@ -90,8 +88,9 @@ void mp3fileout_closesocket(int fd)
 #endif
 #ifdef NT
     closesocket(fd);
-#endif
+#else
     sys_rmpollfn(fd);
+#endif
 }
 
 /* ------------------------ mp3fileout~ ----------------------------- */
@@ -390,6 +389,7 @@ static void mp3fileout_open(t_mp3fileout *x, t_symbol *filename)
        x->x_outframes = 0;
        outlet_float( x->x_frames, x->x_outframes );
     }
+
     if ( ( x->x_fd = open( filename->s_name, O_RDONLY ) ) < 0 )
     {
        post( "mp3fileout~ : could not open file : %s", filename->s_name );
diff --git a/mp3live~/mp3streamin~.c b/mp3live~/mp3streamin~.c
index 0d88096..74a11f4 100644
--- a/mp3live~/mp3streamin~.c
+++ b/mp3live~/mp3streamin~.c
@@ -51,18 +51,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
-#include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
-#include "interface.h"   /* mpglib decoding library from lame 3.92 */
 #define SOCKET_ERROR -1
 #else
 #include <winsock.h>
+#define MSG_NOSIGNAL 0
+#define SOL_TCP IPPROTO_TCP
 #endif
-
-#ifdef NT
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
-#endif
+#include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
+#include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
+#include "interface.h"   /* mpglib decoding library from lame 3.92 */
 
 #define MIN_AUDIO_INPUT 8064 // we must a least have 8 chunks to play a correct sound
 #define INPUT_BUFFER_SIZE MIN_AUDIO_INPUT
diff --git a/mp3live~/mp3streamout~.c b/mp3live~/mp3streamout~.c
index 414af92..8208f38 100644
--- a/mp3live~/mp3streamout~.c
+++ b/mp3live~/mp3streamout~.c
@@ -29,13 +29,6 @@
 /* Theo Hakola --                                                               */
 /* ---------------------------------------------------------------------------- */
 
-
-
-#ifdef NT
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
-#endif
-
 #include <sys/types.h>
 #include <string.h>
 #include <stdio.h>
@@ -54,15 +47,15 @@
 #include <netdb.h>
 #include <time.h>
 #include <sys/time.h>
-#include <lame/lame.h>        /* lame encoder stuff */
 #define SOCKET_ERROR -1
 #else
 #include <io.h>
 #include <windows.h>
 #include <winsock.h>
 #include <windef.h>
-#include "lame_enc.h"        /* lame encoder stuff */
+#define MSG_NOSIGNAL 0
 #endif
+#include <lame/lame.h>        /* lame encoder stuff */
 
 #include "m_pd.h"            /* standard pd stuff */
 
@@ -81,16 +74,6 @@ extern int head_check( unsigned long head, int check_layer );
 
 static char   *mp3streamout_version = "mp3streamout~: mp3 peer-to-peer streamer version 0.3, written by ydegoyon@free.fr";
 
-#ifndef UNIX
-static        HINSTANCE           dll             = NULL;
-static        BEINITSTREAM        initStream      = NULL;
-static        BEENCODECHUNK       encodeChunk     = NULL;
-static        BEDEINITSTREAM      deinitStream    = NULL;
-static        BECLOSESTREAM       closeStream     = NULL;
-static        BEVERSION           dllVersion      = NULL;
-static        BEWRITEVBRHEADER    writeVBRHeader  = NULL;
-#endif
-
 static t_class *mp3streamout_class;
 
 typedef struct _mp3streamout
@@ -123,9 +106,7 @@ typedef struct _mp3streamout
 
     t_float x_f;              /* float needed for signal input */
 
-#ifdef UNIX
     lame_global_flags* lgfp;
-#endif
 } t_mp3streamout;
 
 
@@ -190,28 +171,18 @@ static void mp3streamout_encode(t_mp3streamout *x)
     }
 
         /* encode mp3 data */
-#ifndef UNIX
-    err = encodeChunk(x->x_lame, x->x_lamechunk, x->x_mp3inbuf, x->x_mp3outbuf, &x->x_mp3size);
-#else
+
     x->x_mp3size = lame_encode_buffer_interleaved(x->lgfp, x->x_mp3inbuf, 
                    x->x_lamechunk/lame_get_num_channels(x->lgfp), 
                    x->x_mp3outbuf, MY_MP3_MALLOC_OUT_SIZE);
     x->x_mp3size+=lame_encode_flush( x->lgfp, x->x_mp3outbuf+x->x_mp3size, MY_MP3_MALLOC_OUT_SIZE-x->x_mp3size );
     // post( "mp3streamout~ : encoding returned %d frames", x->x_mp3size );
-#endif
 
         /* check result */
-#ifndef UNIX
-    if(err != BE_ERR_SUCCESSFUL)
-    {
-        closeStream(x->x_lame);
-        error("mp3streamout~: lameEncodeChunk() failed (%lu)", err);
-#else
     if(x->x_mp3size<0)
     {
         lame_close( x->lgfp );
         error("mp3streamout~: lame_encode_buffer_interleaved failed (%d)", x->x_mp3size);
-#endif
         x->x_lame = -1;
     }
 }
@@ -237,11 +208,7 @@ static void mp3streamout_stream(t_mp3streamout *x)
     if(count < 0)
     {
         error("mp3streamout~: could not send encoded data to the peer (%d)", count);
-#ifndef UNIX
-        closeStream(x->x_lame);
-#else
         lame_close( x->lgfp );
-#endif
         x->x_lame = -1;
 #ifndef UNIX
         closesocket(x->x_fd);
@@ -368,19 +335,12 @@ static void mp3streamout_dsp(t_mp3streamout *x, t_signal **sp)
     /* initialize the lame library */
 static void mp3streamout_tilde_lame_init(t_mp3streamout *x)
 {
-#ifndef UNIX
-        /* encoder related stuff (calculating buffer size) */
-    BE_VERSION    lameVersion        = {0,};                                /* version number of LAME */
-    BE_CONFIG     lameConfig         = {0,};                                /* config structure of LAME */
-    unsigned int    ret;
-#else
     int    ret;
     x->lgfp = lame_init(); /* set default parameters for now */
-#endif
 
 #ifndef UNIX
     /* load lame_enc.dll library */
-
+    HINSTANCE dll;
     dll=LoadLibrary("lame_enc.dll");
     if(dll==NULL)
     {
@@ -391,75 +351,12 @@ static void mp3streamout_tilde_lame_init(t_mp3streamout *x)
         post("mp3streamout~: connection closed");
         return;
     }
-
-        /* get Interface functions */
-    initStream      = (BEINITSTREAM) GetProcAddress(dll, TEXT_BEINITSTREAM);
-    encodeChunk     = (BEENCODECHUNK) GetProcAddress(dll, TEXT_BEENCODECHUNK);
-    deinitStream    = (BEDEINITSTREAM) GetProcAddress(dll, TEXT_BEDEINITSTREAM);
-    closeStream     = (BECLOSESTREAM) GetProcAddress(dll, TEXT_BECLOSESTREAM);
-    dllVersion      = (BEVERSION) GetProcAddress(dll, TEXT_BEVERSION);
-    writeVBRHeader  = (BEWRITEVBRHEADER) GetProcAddress(dll,TEXT_BEWRITEVBRHEADER);
-
-        /* check if all interfaces are present */
-    if(!initStream || !encodeChunk || !deinitStream || !closeStream || !dllVersion || !writeVBRHeader)
-    {
-
-        error("mp3streamout~: unable to get LAME interfaces");
-        closesocket(x->x_fd);
-        x->x_fd = -1;
-        outlet_float(x->x_obj.ob_outlet, 0);
-        post("mp3streamout~: connection closed");
-        return;
-    }
-
-        /* get LAME version number */
-    dllVersion(&lameVersion);
-
-    post(   "mp3streamout~: lame_enc.dll version %u.%02u (%u/%u/%u)\n"
-            "            lame_enc engine %u.%02u",    
-            lameVersion.byDLLMajorVersion, lameVersion.byDLLMinorVersion,
-            lameVersion.byDay, lameVersion.byMonth, lameVersion.wYear,
-            lameVersion.byMajorVersion, lameVersion.byMinorVersion);
-
-    memset(&lameConfig,0,sizeof(lameConfig));                        /* clear all fields */
-#else
+#endif
     {
        const char *lameVersion = get_lame_version();
        post( "mp3streamout~ : using lame version : %s", lameVersion );
     }
-#endif 
-
-#ifndef UNIX
-
-        /* use the LAME config structure */
-    lameConfig.dwConfig = BE_CONFIG_LAME;
-
-        /* set the mpeg format flags */
-    lameConfig.format.LHV1.dwStructVersion  = 1;
-    lameConfig.format.LHV1.dwStructSize     = sizeof(lameConfig);        
-    lameConfig.format.LHV1.dwSampleRate     = (int)sys_getsr();     /* input frequency - pd's sample rate */
-    lameConfig.format.LHV1.dwReSampleRate   = x->x_samplerate;      /* output s/r - resample if necessary */
-    lameConfig.format.LHV1.nMode            = x->x_mp3mode;         /* output mode */
-    lameConfig.format.LHV1.dwBitrate        = x->x_bitrate;         /* mp3 bitrate */
-    lameConfig.format.LHV1.nPreset          = x->x_mp3quality;      /* mp3 encoding quality */
-    lameConfig.format.LHV1.dwMpegVersion    = MPEG1;                /* use MPEG1 */
-    lameConfig.format.LHV1.dwPsyModel       = 0;                    /* USE DEFAULT PSYCHOACOUSTIC MODEL */
-    lameConfig.format.LHV1.dwEmphasis       = 0;                    /* NO EMPHASIS TURNED ON */
-    lameConfig.format.LHV1.bOriginal        = TRUE;                 /* SET ORIGINAL FLAG */
-    lameConfig.format.LHV1.bCopyright       = TRUE;                 /* SET COPYRIGHT FLAG */
-    lameConfig.format.LHV1.bNoRes           = TRUE;                 /* no bit resorvoir */
-
-        /* init the MP3 stream */
-    ret = initStream(&lameConfig, &x->x_lamechunk, &x->x_mp3size, &x->x_lame);
-
-        /* check result */
-    if(ret != BE_ERR_SUCCESSFUL)
-    {
-        post("mp3streamout~: error opening encoding stream (%lu)", ret);
-        return;
-    }
 
-#else
         /* setting lame parameters */
     lame_set_num_channels( x->lgfp, 2);
     lame_set_in_samplerate( x->lgfp, sys_getsr() );
@@ -483,9 +380,6 @@ static void mp3streamout_tilde_lame_init(t_mp3streamout *x)
        post( "mp3streamout~ : lame initialization done. (%d)", x->x_lame );
     }
     lame_init_bitstream( x->lgfp );
-#endif
-
-
 }
 
     /* connect to the peer         */
@@ -567,23 +461,11 @@ static void mp3streamout_disconnect(t_mp3streamout *x)
     int err = -1;
     if(x->x_lame >= 0)
     {
-#ifndef UNIX
-            /* deinit the stream */
-        err = deinitStream(x->x_lame, x->x_mp3outbuf, &x->x_mp3size);
-
-            /* check result */
-        if(err != BE_ERR_SUCCESSFUL)
-        {
-            error("exiting mp3 stream failed (%lu)", err);
-        }
-        closeStream(x->x_lame); /* close mp3 encoder stream */
-#else
             /* ignore remaining bytes */
         if ( x->x_mp3size = lame_encode_flush( x->lgfp, x->x_mp3outbuf, 0) < 0 ) {
             post( "mp3streamout~ : warning : remaining encoded bytes" );
         }
         lame_close( x->lgfp );
-#endif
         x->x_lame = -1;
         post("mp3streamout~: encoder stream closed");
     }
@@ -676,11 +558,8 @@ static void mp3streamout_free(t_mp3streamout *x)
 {
 
     if(x->x_lame >= 0)
-#ifndef UNIX
-        closeStream(x->x_lame);
-#else
         lame_close( x->lgfp );
-#endif
+
     if(x->x_fd >= 0)
 #ifndef UNIX
         closesocket(x->x_fd);