Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
David MacDonald
purr-data
Commits
b7b66e10
Commit
b7b66e10
authored
Aug 15, 2007
by
Miller Puckette
Browse files
fixes for MSW
parent
745c243b
Changes
5
Show whitespace changes
Inline
Side-by-side
msw/get-msw.sh
View file @
b7b66e10
#!/bin/tcsh
rm
-rf
image
mkdir
image
cd
image
rm
-rf
/tmp/
image
mkdir
/tmp/
image
cd
/tmp/
image
unzip
-q
/tmp/pdout.zip
find
.
\(
-name
"*.lib"
-o
-name
"*.exe"
-o
-name
"*.dll"
-o
-name
"*.obj"
\
-o
-name
"*.exp"
\)
\
...
...
src/m_sched.c
View file @
b7b66e10
...
...
@@ -7,6 +7,9 @@
#include
"m_pd.h"
#include
"m_imp.h"
#include
"s_stuff.h"
#ifdef MSW
#include
<windows.h>
#endif
/* LATER consider making this variable. It's now the LCM of all sample
rates we expect to see: 32000, 44100, 48000, 88200, 96000. */
...
...
@@ -529,7 +532,11 @@ static void m_callbackscheduler(void)
sys_initmidiqueue
();
while
(
1
)
{
#ifdef MSW
Sleep
(
1000
);
#else
sleep
(
1
);
#endif
if
(
sys_idlehook
)
sys_idlehook
();
}
...
...
src/makefile.nt
View file @
b7b66e10
...
...
@@ -38,19 +38,20 @@ SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
$(SYSSRC)
PADIR
=
..
\p
ortaudio
INCPA
=
-I
$(PADIR)
-I
$(PADIR)
\p
a_common
-I
$(PADIR)
\p
ablio
-I
..
\l
ib
\a
sio
SRCPA
=
$(PADIR)
/pa_common/pa_stream.c
\
$(PADIR)
/pa_common/pa_trace.c
\
$(PADIR)
/pa_common/pa_skeleton.c
\
$(PADIR)
/pa_common/pa_process.c
\
$(PADIR)
/pa_common/pa_front.c
\
$(PADIR)
/pa_common/pa_dither.c
\
$(PADIR)
/pa_common/pa_cpuload.c
\
$(PADIR)
/pa_common/pa_converters.c
\
$(PADIR)
/pa_common/pa_allocation.c
\
$(PADIR)
/pa_win/pa_win_util.c
\
$(PADIR)
/pa_win/pa_win_hostapis.c
\
$(PADIR)
/pa_win_wmme/pa_win_wmme.c
INCPA
=
-I
$(PADIR)
\i
nclude
-I
$(PADIR)
\s
rc
\c
ommon
-I
..
\l
ib
\a
sio
PASRC
=
$(PADIR)
\s
rc
SRCPA
=
$(PASRC)
/common/pa_stream.c
\
$(PASRC)
/common/pa_trace.c
\
$(PASRC)
/common/pa_skeleton.c
\
$(PASRC)
/common/pa_process.c
\
$(PASRC)
/common/pa_front.c
\
$(PASRC)
/common/pa_dither.c
\
$(PASRC)
/common/pa_cpuload.c
\
$(PASRC)
/common/pa_converters.c
\
$(PASRC)
/common/pa_allocation.c
\
$(PASRC)
/os/win/pa_win_hostapis.c
\
$(PASRC)
/os/win/pa_win_util.c
\
$(PASRC)
/hostapi/wmme/pa_win_wmme.c
# $(PADIR)/pa_win_wdmks/pa_win_wdmks.c
SRCASIO
=
$(PADIR)
/pa_asio/pa_asio.cpp
...
...
@@ -63,12 +64,12 @@ $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib ..\lib\asio\asiolib.lib
PAOBJ
=
pa_stream.obj pa_trace.obj pa_skeleton.obj pa_process.obj
\
pa_front.obj pa_dither.obj pa_cpuload.obj pa_converters.obj
\
pa_allocation.obj pa_win_
util
.obj pa_win_
hostapis
.obj pa_asio.obj
\
pa_allocation.obj pa_win_
hostapis
.obj pa_win_
util
.obj pa_asio.obj
\
pa_win_wmme.obj
# pa_win_wdmks.obj
PMDIR
=
..
\p
ortmidi
INCPM
=
-I
$(PMDIR)
\p
m_common
-I
$(PMDIR)
\p
m_win
-I
$(PMDIR)
\p
orttime
INCPM
=
-I
$(PMDIR)
\p
m_common
-I
$(PMDIR)
\p
m_win
-I
$(PMDIR)
\p
orttime
-DNEWBUFFER
SRCPM
=
$(PADIR)
/pm_common/portmidi.c
\
$(PMDIR)
/pm_common/pmutil.c
\
$(PMDIR)
/porttime/porttime.c
\
...
...
@@ -127,37 +128,37 @@ s_entry_com.obj: s_entry.c
..
\b
in
\p
d.lib
$(LIB)
$(ASIOLIB)
# explicit rules to compile portaudio sources:
pa_stream.obj
:
$(PA
DIR)
\p
a_
common
\p
a_stream.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_stream.c
pa_trace.obj
:
$(PA
DIR)
\p
a_
common
\p
a_trace.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_trace.c
pa_skeleton.obj
:
$(PA
DIR)
\p
a_
common
\p
a_skeleton.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_skeleton.c
pa_process.obj
:
$(PA
DIR)
\p
a_
common
\p
a_process.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_process.c
pa_front.obj
:
$(PA
DIR)
\p
a_
common
\p
a_front.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_front.c
pa_dither.obj
:
$(PA
DIR)
\p
a_
common
\p
a_dither.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_dither.c
pa_cpuload.obj
:
$(PA
DIR)
\p
a_
common
\p
a_cpuload.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_cpuload.c
pa_converters.obj
:
$(PA
DIR)
\p
a_
common
\p
a_converters.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_converters.c
pa_allocation.obj
:
$(PA
DIR)
\p
a_
common
\p
a_allocation.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
common
\p
a_allocation.c
pa_win_
util
.obj
:
$(PA
DIR)
\p
a_
win
\p
a_win_
util
.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
win
\p
a_win_
util
.c
pa_win_
hostapis
.obj
:
$(PA
DIR)
\p
a_
win
\p
a_win_
hostapis
.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
win
\p
a_win_
hostapis
.c
pa_win_wmme.obj
:
$(PA
DIR)
\p
a_win_
wmme
\p
a_win_wmme.c
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_win_
wmme
\p
a_win_wmme.c
pa_stream.obj
:
$(PA
SRC)
\
c
ommon
\p
a_stream.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_stream.c
pa_trace.obj
:
$(PA
SRC)
\
c
ommon
\p
a_trace.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_trace.c
pa_skeleton.obj
:
$(PA
SRC)
\
c
ommon
\p
a_skeleton.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_skeleton.c
pa_process.obj
:
$(PA
SRC)
\
c
ommon
\p
a_process.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_process.c
pa_front.obj
:
$(PA
SRC)
\
c
ommon
\p
a_front.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_front.c
pa_dither.obj
:
$(PA
SRC)
\
c
ommon
\p
a_dither.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_dither.c
pa_cpuload.obj
:
$(PA
SRC)
\
c
ommon
\p
a_cpuload.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_cpuload.c
pa_converters.obj
:
$(PA
SRC)
\
c
ommon
\p
a_converters.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_converters.c
pa_allocation.obj
:
$(PA
SRC)
\
c
ommon
\p
a_allocation.c
cl /c
$(ALLCF)
$(PA
SRC)
\
c
ommon
\p
a_allocation.c
pa_win_
hostapis
.obj
:
$(PA
SRC)
\o
s
\
w
in
\p
a_win_
hostapis
.c
cl /c
$(ALLCF)
$(PA
SRC)
\o
s
\
w
in
\p
a_win_
hostapis
.c
pa_win_
util
.obj
:
$(PA
SRC)
\o
s
\
w
in
\p
a_win_
util
.c
cl /c
$(ALLCF)
$(PA
SRC)
\o
s
\
w
in
\p
a_win_
util
.c
pa_win_wmme.obj
:
$(PA
SRC)
\h
ostapi
\
w
mme
\p
a_win_wmme.c
cl /c
$(ALLCF)
$(PA
SRC)
\h
ostapi
\
w
mme
\p
a_win_wmme.c
pa_win_wdmks.obj
:
$(PADIR)
\p
a_win_wdmks
\p
a_win_wdmks.c
cl /c
$(ALLCF)
\
-DWINVER
=
0x400
-DKSAUDIO_SPEAKER_DIRECTOUT
\
$(PADIR)
\p
a_win_wdmks
\p
a_win_wdmks.c
pa_asio.obj
:
$(PA
DIR)
\p
a_
asio
\p
a_asio.cpp
cl /c
$(ALLCF)
$(PA
DIR)
\p
a_
asio
\p
a_asio.cpp
pa_asio.obj
:
$(PA
SRC)
\h
ostapi
\
a
sio
\p
a_asio.cpp
cl /c
$(ALLCF)
$(PA
SRC)
\h
ostapi
\
a
sio
\p
a_asio.cpp
portmidi.obj
:
$(PMDIR)
\p
m_common
\p
ortmidi.c
cl /c
$(ALLCF)
$(PMDIR)
\p
m_common
\p
ortmidi.c
...
...
src/s_audio_mmio.c
View file @
b7b66e10
...
...
@@ -694,7 +694,7 @@ idle:
/* ------------------- public routines -------------------------- */
void
mmio_open_audio
(
int
naudioindev
,
int
*
audioindev
,
int
mmio_open_audio
(
int
naudioindev
,
int
*
audioindev
,
int
nchindev
,
int
*
chindev
,
int
naudiooutdev
,
int
*
audiooutdev
,
int
nchoutdev
,
int
*
choutdev
,
int
rate
)
{
...
...
@@ -724,7 +724,7 @@ void mmio_open_audio(int naudioindev, int *audioindev,
(
nt_nwaveout
>
1
?
WAVE_MAPPER
:
-
1
)
:
audiooutdev
[
0
]);
if
(
naudiooutdev
>
1
||
naudioindev
>
1
)
post
(
"separate audio device choice not supported; using sequential devices."
);
mmio_do_open_audio
();
return
(
mmio_do_open_audio
()
)
;
}
...
...
src/s_stuff.h
View file @
b7b66e10
...
...
@@ -251,7 +251,7 @@ void jack_getdevs(char *indevlist, int *nindevs,
int
maxndev
,
int
devdescsize
);
void
jack_listdevs
(
void
);
void
mmio_open_audio
(
int
naudioindev
,
int
*
audioindev
,
int
mmio_open_audio
(
int
naudioindev
,
int
*
audioindev
,
int
nchindev
,
int
*
chindev
,
int
naudiooutdev
,
int
*
audiooutdev
,
int
nchoutdev
,
int
*
choutdev
,
int
rate
);
void
mmio_close_audio
(
void
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment