Moved mciseq to the top-level dlls directory.

This commit is contained in:
Rémi Assailly 2005-08-17 12:15:35 +00:00 committed by Alexandre Julliard
parent aad2fe3b38
commit 5df5e40164
11 changed files with 23 additions and 33 deletions

8
configure vendored

File diff suppressed because one or more lines are too long

View File

@ -1538,6 +1538,8 @@ dlls/lzexpand/Makefile
dlls/lzexpand/tests/Makefile
dlls/mapi32/Makefile
dlls/mapi32/tests/Makefile
dlls/mcicda/Makefile
dlls/mciseq/Makefile
dlls/midimap/Makefile
dlls/mlang/Makefile
dlls/mlang/tests/Makefile
@ -1548,8 +1550,8 @@ dlls/msacm/Makefile
dlls/msacm/imaadp32/Makefile
dlls/msacm/msadp32/Makefile
dlls/msacm/msg711/Makefile
dlls/msacm/winemp3/Makefile
dlls/msacm/tests/Makefile
dlls/msacm/winemp3/Makefile
dlls/mscms/Makefile
dlls/mscms/tests/Makefile
dlls/msdmo/Makefile
@ -1653,8 +1655,6 @@ dlls/winmm/Makefile
dlls/winmm/joystick/Makefile
dlls/winmm/mcianim/Makefile
dlls/winmm/mciavi/Makefile
dlls/mcicda/Makefile
dlls/winmm/mciseq/Makefile
dlls/winmm/mciwave/Makefile
dlls/winmm/tests/Makefile
dlls/winmm/wavemap/Makefile

View File

@ -71,6 +71,7 @@ BASEDIRS = \
lzexpand \
mapi32 \
mcicda \
mciseq \
midimap \
mlang \
mmdevldr.vxd \
@ -158,7 +159,6 @@ BASEDIRS = \
winmm/joystick \
winmm/mcianim \
winmm/mciavi \
winmm/mciseq \
winmm/mciwave \
winmm/wavemap \
winmm/winealsa \
@ -321,7 +321,7 @@ SYMLINKS_SO = \
mcianim.drv.so \
mciavi.drv.so \
mcicda.dll.so \
mciseq.drv.so \
mciseq.dll.so \
mciwave.drv.so \
midimap.dll.so \
mlang.dll.so \
@ -658,8 +658,8 @@ mciavi.drv.so: winmm/mciavi/mciavi.drv.so
mcicda.dll.so: mcicda/mcicda.dll.so
$(RM) $@ && $(LN_S) mcicda/mcicda.dll.so $@
mciseq.drv.so: winmm/mciseq/mciseq.drv.so
$(RM) $@ && $(LN_S) winmm/mciseq/mciseq.drv.so $@
mciseq.dll.so: mciseq/mciseq.dll.so
$(RM) $@ && $(LN_S) mciseq/mciseq.dll.so $@
mciwave.drv.so: winmm/mciwave/mciwave.drv.so
$(RM) $@ && $(LN_S) winmm/mciwave/mciwave.drv.so $@
@ -1666,7 +1666,7 @@ mapi32/mapi32.dll.so: mapi32
winmm/mcianim/mcianim.drv.so: winmm/mcianim
winmm/mciavi/mciavi.drv.so: winmm/mciavi
mcicda/mcicda.dll.so: mcicda
winmm/mciseq/mciseq.drv.so: winmm/mciseq
mciseq/mciseq.dll.so: mciseq
winmm/mciwave/mciwave.drv.so: winmm/mciwave
midimap/midimap.dll.so: midimap
mlang/mlang.dll.so: mlang

2
dlls/mciseq/.cvsignore Normal file
View File

@ -0,0 +1,2 @@
Makefile
mciseq.dll.dbg.c

View File

@ -1,8 +1,8 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciseq.drv
MODULE = mciseq.dll
IMPORTS = winmm user32 kernel32
C_SRCS = \

View File

@ -1,10 +1,8 @@
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Sample MIDI Wine Driver for Linux
*
* Copyright 1994 Martin Ayotte
* 1999 Eric Pouech
* Copyright 1994 Martin Ayotte
* Copyright 1999 Eric Pouech
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -21,14 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
* Eric POUECH :
* 98/7 changes for making this MIDI driver work on OSS
* current support is limited to MIDI ports of OSS systems
* 98/9 rewriting MCI code for MIDI
* 98/11 splitted in midi.c and mcimidi.c
*/
/* TODO:
* + implement it correctly
* + finish asynchronous commands (especially for reading/record)
@ -1092,7 +1082,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
mmt->wStatus = 0;
break;
case 0x51:/* set tempo */
/* Tempo is expressed in µ-seconds per midi quarter note
/* Tempo is expressed in -seconds per midi quarter note
* for format 1 MIDI files, this can only be present on track #0
*/
if (mmt->wTrackNr != 0 && wmm->wFormat == 1) {

1
dlls/mciseq/mciseq.spec Normal file
View File

@ -0,0 +1 @@
@ stdcall -private DriverProc(long long long long long) MCIMIDI_DriverProc

View File

@ -1,2 +0,0 @@
Makefile
mciseq.drv.dbg.c

View File

@ -1 +0,0 @@
@ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc

View File

@ -1799,7 +1799,7 @@ DWORD
HDRVR
LONG
%%mciseq.drv
%%mciseq.dll
%long

View File

@ -209,7 +209,7 @@ HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixel
[MCI]
HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv"
HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll"
HKLM,%Mci32Str%,"Sequencer",,"mciseq.drv"
HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll"
HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv"
HKLM,%MciExtStr%,"aifc",,"MPEGVideo"
@ -2067,7 +2067,7 @@ system.ini, mci,,"MPEGVideo=mciqtz.drv"
system.ini, mci,,"MPEGVideo2=mciqtz.drv"
system.ini, mci,,"avivideo=mciavi.drv"
system.ini, mci,,"cdaudio=mcicda.dll"
system.ini, mci,,"sequencer=mciseq.drv"
system.ini, mci,,"sequencer=mciseq.dll"
system.ini, mci,,"vcr=mcivisca.drv"
system.ini, mci,,"; videodisc=mcipionr.drv"
system.ini, mci,,"waveaudio=mciwave.drv"