Changeset 288


Ignore:
Timestamp:
Feb 14, 2008, 6:18:58 AM (17 years ago)
Author:
Brendan Oakley
Message:

Clean up excessive Uni16 debug output and enable sending output to uniaud32 on Release builds - from Allan

Location:
OCO/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • OCO/trunk/drv16/commdbg.c

    r266 r288  
    1 /* $Id: commdbg.c,v 1.1.1.1 2003/07/02 13:57:04 eleph Exp $ */
    21
    32/******************************************************************************
    … …  
    3635#ifdef DEBUG
    3736#pragma code_seg ("_debugtext");
     37#endif
    3838
    3939#define INCL_NOPMAPI
    … …  
    339339}
    340340
     341#ifdef DEBUG
    341342
    342343void StringOut(char far *DbgStr)

  • OCO/trunk/drv16/ossidc16.cpp

    r266 r288  
    1 /* $Id: ossidc16.cpp,v 1.1.1.1 2003/07/02 13:57:06 eleph Exp $ */
    21/*
    32 * IDC functions for calling 32bit GPL driver interfaces
    … …  
    827826{
    828827    dprintf (("  nrStreams     %d",   pWaveCaps->nrStreams));
    829     dprintf (("  ulMinChannels %d",   pWaveCaps->ulMinChannels));
    830     dprintf (("  ulMaxChannels %d",   pWaveCaps->ulMaxChannels));
     828    dprintf (("  ulMinChannels %ld",   pWaveCaps->ulMinChannels));
     829    dprintf (("  ulMaxChannels %ld",   pWaveCaps->ulMaxChannels));
    831830    dprintf (("  ulChanFlags   %lxh",  pWaveCaps->ulChanFlags));
    832831    if (pWaveCaps->ulChanFlags & OSS32_CAPS_PCM_CHAN_MONO)
    … …  
    840839   
    841840
    842     dprintf (("  ulMinRate     %d",   pWaveCaps->ulMinRate));
    843     dprintf (("  ulMaxRate     %d",   pWaveCaps->ulMaxRate));
     841    dprintf (("  ulMinRate     %ld",   pWaveCaps->ulMinRate));
     842    dprintf (("  ulMaxRate     %ld",   pWaveCaps->ulMaxRate));
    844843
    845844    dprintf (("  ulRateFlags   %lxh",  pWaveCaps->ulRateFlags));

  • OCO/trunk/drv16/waveplay.cpp

    r271 r288  
    1 /* $Id: waveplay.cpp,v 1.1.1.1 2003/07/02 13:57:08 eleph Exp $ */
    21
    32/* SCCSID = %W% %E% */
    … …  
    169168    int rc;
    170169
    171 #ifdef DEBUG
    172     dprintf(("WAVEPLAY::ConfigDev"));
    173 #endif
    174170
    175171    if (fAPMSuspend)
    … …  
    194190    }
    195191#ifdef DEBUG
    196     dprintf(("WAVEPLAY::ConfigDev1 SampleRate %d", pConfigInfo->ulHwSampleRate));
    197     dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %d", ulFirstBufSize));
    198     dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %d", pConfigInfo->ulFragsize));
     192    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
     193    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %ld", ulFirstBufSize));
     194    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %ld", pConfigInfo->ulFragsize));
    199195#endif
    200196
    … …  
    213209        ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
    214210#ifdef DEBUG
    215         dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %d", ulFirstBufSize));
     211        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %ld", ulFirstBufSize));
    216212#endif /* DEBUG */
    217213    }
    … …  
    219215    //Must call this method (i.e. resets sample rate conversion position)
    220216    WAVEAUDIO::ConfigDev(StreamId, pConfigInfo, ulFirstBufSize);
    221 #ifdef DEBUG
    222     dprintf(("WAVEPLAY::ConfigDev3 ulFirstBufSize %d", ulFirstBufSize));
    223 #endif /* DEBUG */
    224217
    225218    //get real sample format used to program the audio hardware (taking conversion into account)
    226219    QuerySampleFormat(OPERATION_PLAY, pConfigInfo);
    227 #ifdef DEBUG
    228     dprintf(("WAVEPLAY::ConfigDev4 ulFirstBufSize %d", ulFirstBufSize));
    229 #endif /* DEBUG */
    230220
    231221    //convert consume rate
    232222    ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
    233223#ifdef DEBUG
    234     dprintf(("WAVEPLAY::ConfigDev5 ulFirstBufSize %d", ulFirstBufSize));
    235     dprintf(("WAVEPLAY::ConfigDev5 ulPCMConsumeRate %d", ulPCMConsumeRate));
    236 
    237     dprintf(("WAVEPLAY::ConfigDev: cons rate %d buf size %d init rate %d", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
    238     dprintf(("WAVEPLAY::ConfigDev6 ulFirstBufSize %d", ulFirstBufSize));
     224    dprintf(("WAVEPLAY::ConfigDev: cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
    239225#endif /* DEBUG */
    240226
    … …  
    265251
    266252#ifdef DEBUG
    267     dprintf(("WAVEPLAY::ConfigDev: SampleRate %d", pConfigInfo->ulHwSampleRate));
    268     dprintf(("WAVEPLAY::ConfigDev2 fragsize %d", fragsize));
     253    dprintf(("WAVEPLAY::ConfigDev2 fragsize %ld", fragsize));
    269254#endif
    270255    hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
    … …  
    275260#ifdef DEBUG
    276261        dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat . rc = %d",rc));
    277         dprintf(("WAVEPLAY:ConfigDev:samp rate %d",hwparam.ulSampleRate));
    278         dprintf(("WAVEPLAY:ConfigDev:bits per sample %d",hwparam.ulBitsPerSample));
    279         dprintf(("WAVEPLAY:ConfigDev:channels %d",hwparam.ulNumChannels));
    280         dprintf(("WAVEPLAY:ConfigDev:data type %d",hwparam.ulDataType));
     262        dprintf(("WAVEPLAY:ConfigDev:samp rate %ld",hwparam.ulSampleRate));
     263        dprintf(("WAVEPLAY:ConfigDev:bits per sample %ld",hwparam.ulBitsPerSample));
     264        dprintf(("WAVEPLAY:ConfigDev:channels %ld",hwparam.ulNumChannels));
     265        dprintf(("WAVEPLAY:ConfigDev:data type %ld",hwparam.ulDataType));
    281266
    282267#endif
    … …  
    319304    {
    320305#ifdef DEBUG
    321         dprintf(("Transfer. NoConv ulB %d",ulBytesToTransfer));
     306        dprintf(("Transfer. NoConv ulB %ld",ulBytesToTransfer));
    322307#endif /* DEBUG */
    323308        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
    … …  
    342327                ulBytesToTransfer = ulBytesToTransfer & ~(pConfigInfo->ulSampleSize-1);
    343328#ifdef DEBUG
    344                 dprintf(("New ulBr %d" , ulBytesToTransfer));
     329                dprintf(("New ulBr %ld" , ulBytesToTransfer));
    345330#endif
    346331            }
    … …  
    356341                DebugInt3();
    357342#ifdef DEBUG
    358                 dprintf(("New pulBr %d" , pulBytesTransferred));
     343                dprintf(("New pulBr %ld" , pulBytesTransferred));
    359344#endif
    360345            }

  • OCO/trunk/drv16/wavestrm.cpp

    r266 r288  
    1 /* $Id: wavestrm.cpp,v 1.1.1.1 2003/07/02 13:57:08 eleph Exp $ */
    21
    32/* SCCSID = %W% %E% */
    … …  
    237236        qhDone.PushOnTail(qhInProcess.PopHead());
    238237    }
    239     dprintf4(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
     238    dprintf(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
    240239    return byteswritten;
    241240}
    … …  
    259258    // read wave data
    260259    if(pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &bytesread) == FALSE) {
    261        dprintf4(("_vReadAudioBuf: pahw->Transfer failed!!"));
     260       dprintf(("_vReadAudioBuf: pahw->Transfer failed!!"));
    262261       return FALSE;
    263262    }
    … …  
    275274        qhDone.PushOnTail(qhInProcess.PopHead());
    276275            ReturnBuffer();
    277             dprintf2(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld position %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread, _ulBytesProcessed));
     276            dprintf(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld position %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread, _ulBytesProcessed));
    278277    }
    279278
    … …  
    323322
    324323#ifdef DEBUG
    325               dprintf(("WARNING: Process: Current pos %ld pos %d incr %d", ulCurBytesProcessed, _ulBytesProcessed, bytesinc));
    326 //            dprintf(("WARNING: hw pos %lx, streampos %lx", ulCurBytesProcessed, ulStreamPos));
     324              dprintf(("WARNING: Process: Current pos %ld pos %ld incr %d", ulCurBytesProcessed, _ulBytesProcessed, bytesinc));
     325              dprintf(("WARNING: hw pos %lx, streampos %lx", ulCurBytesProcessed, ulStreamPos));
    327326#endif /* DEBUG */
    328327        }

  • OCO/trunk/include/dbgos2.h

    r33 r288  
    1 /* $Id: dbgos2.h,v 1.2 2003/08/08 15:09:03 vladest Exp $ */
    21/*
    32 * Header for debug functions
    … …  
    2019#endif
    2120
    22 #ifdef DEBUG
    2321#define dprintf(a)  if(dbglevel >= 1) PrintfOut a
    2422#define dprintf2(a) if(dbglevel >= 2) PrintfOut a
    … …  
    2624#define dprintf4(a) if(dbglevel >= 4) PrintfOut a
    2725#define DebugInt3() ;//    _asm int 3
    28 #else
    29 #define dprintf(a)
    30 #define dprintf2(a)
    31 #define dprintf3(a)
    32 #define dprintf4(a)
    33 #define DebugInt3()     
    34 #endif
    3526
    3627#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.