Changeset 5873 for trunk/src


Ignore:
Timestamp:
Jun 2, 2001, 10:30:35 AM (24 years ago)
Author:
sandervl
Message:

check odin.ini key for waveout volume override

Location:
trunk/src/winmm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/initterm.cpp

    r5366 r5873  
    2626#define  INCL_DOSMODULEMGR
    2727#define  INCL_DOSPROCESS
     28#define  INCL_DOSSEMAPHORES
    2829#include <os2wrap.h>    //Odin32 OS/2 api wrappers
    2930#include <stdlib.h>
    … …  
    3839#include <initdll.h>
    3940#include "auxiliary.h"
     41#include "winmmtype.h"
     42#include "waveoutbase.h"
     43#include <win\options.h>
    4044
    4145#define DBG_LOCALLOG    DBG_initterm
    … …  
    6367    {
    6468    case DLL_PROCESS_ATTACH:
     69    {
    6570        if (!MULTIMEDIA_CreateIData(hinstDLL))
    6671            return FALSE;
    … …  
    7378            bInitDone = TRUE;
    7479        }
     80        DWORD dwVolume;
     81
     82        dwVolume = PROFILE_GetOdinIniInt(WINMM_SECTION, DEFVOL_KEY, 100);
     83        dwVolume = (dwVolume*0xFFFF)/100;
     84        dwVolume = (dwVolume << 16) | dwVolume;
     85        WaveOut::setDefaultVolume(dwVolume);
    7586        return TRUE;
     87   }
    7688
    7789   case DLL_THREAD_ATTACH:

  • trunk/src/winmm/waveoutbase.cpp

    r5358 r5873  
    1 /* $Id: waveoutbase.cpp,v 1.1 2001-03-23 16:23:45 sandervl Exp $ */
     1/* $Id: waveoutbase.cpp,v 1.2 2001-06-02 08:30:35 sandervl Exp $ */
    22
    33/*
    … …  
    104104/******************************************************************************/
    105105/******************************************************************************/
     106DWORD WaveOut::getDefaultVolume()
     107{
     108  return defvolume;
     109}
     110/******************************************************************************/
     111/******************************************************************************/
    106112ULONG WaveOut::defvolume = 0xFFFFFFFF;
    107113

  • trunk/src/winmm/waveoutbase.h

    r5358 r5873  
    1 /* $Id: waveoutbase.h,v 1.1 2001-03-23 16:23:45 sandervl Exp $ */
     1/* $Id: waveoutbase.h,v 1.2 2001-06-02 08:30:35 sandervl Exp $ */
    22
    33/*
    … …  
    3636
    3737  static void setDefaultVolume(ULONG volume);
     38 static DWORD getDefaultVolume();
    3839
    3940protected:
Note: See TracChangeset for help on using the changeset viewer.