Ignore:
Timestamp:
Oct 2, 2023, 11:34:35 PM (2 years ago)
Author:
gyoung
Message:

Remaining changes from merge with Lars 2.9 branch

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/classes/c/c_audio/cwaudio.c

    r93 r104  
     1
     2/*
     3 *  This file was generated by the SOM Compiler.
     4 *  Generated using:
     5 *     SOM incremental update: 2.47
     6 */
     7
    18
    29/*
     
    664671 * The prototype for cwaudio_cwmmSetTrackInfo was replaced by the following prototype:
    665672 */
     673
     674/*
     675 * SOM_Scope BOOL  SOMLINK cwaudio_cwmmSetTrackInfo(MMAudio *somSelf,
     676 *                                                  char* chrString,
     677 *                                                  ULONG ulValue,
     678 *                                                  int iWhich)
     679 */
     680
     681/*
     682 * The prototype for cwaudio_cwmmSetTrackInfo was replaced by the following prototype:
     683 */
    666684SOM_Scope BOOL  SOMLINK cwaudio_cwmmSetTrackInfo(MMAudio *somSelf,
    667685                                                 char* chrString,
    668686                                                 ULONG ulValue,
    669                                                  int iWhich)
     687                                                 ULONG iWhich)
    670688{
    671689  ULONG ulError;
     
    939957/* successful completion.                                */
    940958/*!!******************************************************/
     959
     960/*
     961 * SOM_Scope ULONG  SOMLINK cwaudio_cwmmQueryTrackInfo(MMAudio *somSelf,
     962 *                                                     PSZ chrString,
     963 *                                                     ULONG ulSize,
     964 *                                                     int iWhich)
     965 */
     966
     967/*
     968 * The prototype for cwaudio_cwmmQueryTrackInfo was replaced by the following prototype:
     969 */
    941970SOM_Scope ULONG  SOMLINK cwaudio_cwmmQueryTrackInfo(MMAudio *somSelf,
    942971                                                    PSZ chrString,
    943972                                                    ULONG ulSize,
    944                                                     int iWhich)
     973                                                    ULONG iWhich)
    945974{
    946975  MMAudioData *somThis = MMAudioGetData(somSelf);
  • trunk/classes/c/c_audio/cwcdtrack.c

    r2 r104  
     1
     2/*
     3 *  This file was generated by the SOM Compiler.
     4 *  Generated using:
     5 *     SOM incremental update: 2.47
     6 */
     7
    18
    29/*
     
    207214    MMCDTrackMethodDebug("MMCDTrack","cwcdtrack_wpFilterPopupMenu");
    208215
    209     return CTXT_SETTINGS | CTXT_HELP;
     216    return CTXT_SETTINGS | CTXT_HELP | CTXT_DELETE;
    210217
    211218    /* We don't want to have XFolder or WPS-Wizard menus here. These are useless
     
    281288 * The prototype for cwcdtrack_cwmmQueryTrackInfo was replaced by the following prototype:
    282289 */
     290
     291/*
     292 * SOM_Scope ULONG  SOMLINK cwcdtrack_cwmmQueryTrackInfo(MMCDTrack *somSelf,
     293 *                                                       PSZ chrString,
     294 *                                                       ULONG ulSize,
     295 *                                                       int iWhich)
     296 */
     297
     298/*
     299 * The prototype for cwcdtrack_cwmmQueryTrackInfo was replaced by the following prototype:
     300 */
    283301SOM_Scope ULONG  SOMLINK cwcdtrack_cwmmQueryTrackInfo(MMCDTrack *somSelf,
    284302                                                      PSZ chrString,
    285303                                                      ULONG ulSize,
    286                                                       int iWhich)
     304                                                      ULONG iWhich)
    287305{
    288306    MMCDTrackData *somThis = MMCDTrackGetData(somSelf);
  • trunk/classes/c/c_audio/cwmp3.c

    r72 r104  
     1
     2/*
     3 *  This file was generated by the SOM Compiler.
     4 *  Generated using:
     5 *     SOM incremental update: 2.47
     6 */
     7
     8
    19/*
    210 * (C) Chris Wohlgemuth 2002-2004
     
    853861 *    cwmmAddTrackNamePage      : override;
    854862 */
     863
     864/*
     865 * SOM_Scope ULONG  SOMLINK cwmp3_cwmmQueryTrackInfo(MMMP3 *somSelf,
     866 *                                                   PSZ chrString,
     867 *                                                   ULONG ulSize,
     868 *                                                   int iWhich)
     869 */
     870
     871/*
     872 * The prototype for cwmp3_cwmmQueryTrackInfo was replaced by the following prototype:
     873 */
    855874SOM_Scope ULONG  SOMLINK cwmp3_cwmmQueryTrackInfo(MMMP3 *somSelf,
    856875                                                  PSZ chrString,
    857876                                                  ULONG ulSize,
    858                                                   int iWhich)
     877                                                  ULONG iWhich)
    859878{
    860879  somId id;
  • trunk/classes/c/c_audio/cwogg.c

    r2 r104  
     1
     2/*
     3 *  This file was generated by the SOM Compiler.
     4 *  Generated using:
     5 *     SOM incremental update: 2.47
     6 */
     7
     8
    19/*
    210 * (C) Chris Wohlgemuth 2002-2004
     
    8896 * The prototype for cwogg_cwmmQueryTrackInfo was replaced by the following prototype:
    8997 */
     98
     99/*
     100 * SOM_Scope ULONG  SOMLINK cwogg_cwmmQueryTrackInfo(MMOGG *somSelf,
     101 *                                                   PSZ chrString,
     102 *                                                   ULONG ulSize,
     103 *                                                   int iWhich)
     104 */
     105
     106/*
     107 * The prototype for cwogg_cwmmQueryTrackInfo was replaced by the following prototype:
     108 */
    90109SOM_Scope ULONG  SOMLINK cwogg_cwmmQueryTrackInfo(MMOGG *somSelf,
    91110                                                  PSZ chrString,
    92111                                                  ULONG ulSize,
    93                                                   int iWhich)
     112                                                  ULONG iWhich)
    94113{
    95114  /*     MMOGGData *somThis = MMOGGGetData(somSelf); */
Note: See TracChangeset for help on using the changeset viewer.