Changeset 195 for libmpc/branches/r2d/mpcenc/wave_in.c

Timestamp:

12/29/06 15:21:35 (18 years ago)

Author:

r2d

Message:

• moved libmpcdec includes in /mpc
• removed mppdec.h and mpp.h
• mpcenc defines cleanup

File:

• libmpc/branches/r2d/mpcenc/wave_in.c (modified) (3 diffs)

libmpc/branches/r2d/mpcenc/wave_in.c

@@ -32 +32 @@
 #endif
 
-
-#if defined USE_OSS_AUDIO  ||  defined USE_ESD_AUDIO  ||  defined USE_SUN_AUDIO
-static void
-Set_Realtime ( void )
-{
-# if defined USE_NICE
-    seteuid     ( 0 );
-    setpriority ( PRIO_PROCESS, getpid(), -20 );
-    seteuid     ( getuid() );
-# endif
-}
-#endif /* USE_OSS_AUDIO || USE_ESD_AUDIO || USE_SUN_AUDIO */
-
-
 #define EXT(x)  (0 == strcasecmp (ext, #x))
 
@@ -59 +45 @@
         fp = SETBINARY_IN ( stdin );
     }
-#ifndef _WIN32
-#ifndef NO_DEV_AUDIO
-    else if ( 0 == strncmp ( filename, "/dev/", 5) ) {
-        int          fd;
-        int          arg;
-        int          org;
-
-        fd = open (filename, O_RDONLY);
-        if ( fd < 0 )
-            return -1;
-
-        type->Channels = org = arg = 2;
-        if ( -1 == ioctl ( fd, SOUND_PCM_WRITE_CHANNELS, &arg ) )
-            return -1;
-        if (arg != org)
-            return -1;
-
-        type->BitsPerSample = org = arg = 16;
-        type->BytesPerSample = 2;
-        if ( -1 == ioctl ( fd, SOUND_PCM_WRITE_BITS, &arg ) )
-            return -1;
-        if (arg != org)
-            return -1;
-
-        org = arg = AFMT_S16_LE;
-        if ( -1 == ioctl ( fd, SNDCTL_DSP_SETFMT, &arg ) )
-            return -1;
-        if ((arg & org) == 0)
-            return -1;
-
-        type->SampleFreq = org = arg = 44100.;
-        if ( -1 == ioctl ( fd, SOUND_PCM_WRITE_RATE, &arg ) )
-            return -1;
-        if ( 23.609375 * abs(arg-org) > abs(arg+org) )    // Sample frequency: Accept 40.5...48.0 kHz for 44.1 kHz
-            return -1;
-
-        type->raw        = 1;
-        type->PCMOffset  = 0;
-        type->PCMBytes   = 0xFFFFFFFF;
-        type->PCMSamples = 86400 * type->SampleFreq;
-
-        fp = fdopen (fd, "rb");
-        Set_Realtime ();
-    }
-#endif
-#else
-    else if ( 0 == strncmp ( filename, "/dev/audio", 10 ) ) {
-        int     tmp;
-        int     fs  = 44100;
-        double  dur = 86400.;
-
-        sscanf ( filename, "%*[^:]:%u:%lf", &fs, &dur );
-
-        fp                     = (FILE*)-1;
-        type -> Channels       =  2;
-        type -> BitsPerSample  = 16;
-        type -> BytesPerSample =  2;
-        type -> SampleFreq     = fs;
-        type -> PCMOffset      =  0;
-        type -> PCMBytes       = 0xFFFFFFFF;
-        type -> PCMSamples     = dur * type -> SampleFreq;
-        type -> raw            = 1;
-        tmp  = init_in ( 1152, (int) floor (type -> SampleFreq + 0.5), type -> Channels, type -> BitsPerSample );
-        if ( tmp )
-            return -1;
-# if   defined USE_REALTIME
-        SetPriorityClass ( GetCurrentProcess (), REALTIME_PRIORITY_CLASS );
-# elif defined USE_NICE
-        SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );
-# endif
-    }
-#endif
     else if ( ext == NULL ) {
         fp = NULL;
@@ -454 +368 @@
     if (type->PCMBytes >= 0xFFFFFF00  ||
                         type->PCMBytes == 0  ||
-                        (Uint32_t)type->PCMBytes % (type -> Channels * type->BytesPerSample) != 0) {
+                        (mpc_uint32_t)type->PCMBytes % (type -> Channels * type->BytesPerSample) != 0) {
                 type->PCMSamples = 36000000 * type->SampleFreq;
         }