Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
purr-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonathan Wilkes
purr-data
Commits
49f5b918
Commit
49f5b918
authored
17 years ago
by
Miller Puckette
Browse files
Options
Downloads
Plain Diff
Merge harpo:pd into test
parents
faf3997c
ec1eadaf
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/configure.in
+6
-4
6 additions, 4 deletions
src/configure.in
src/m_sched.c
+4
-1
4 additions, 1 deletion
src/m_sched.c
src/s_audio.c
+5
-5
5 additions, 5 deletions
src/s_audio.c
with
15 additions
and
10 deletions
src/configure.in
+
6
−
4
View file @
49f5b918
...
...
@@ -101,10 +101,6 @@ fi
dnl look for tcl 8.x... do I really have to go through all this!?
if test x$tk != "xno"; then
GUISRC="t_main.c t_tkcmd.c"
fi
foundit=no
if test $foundit = "no";
then
...
...
@@ -171,6 +167,12 @@ AC_CHECK_LIB(tk85, main,,
echo no tk library found; exit 1)))))))
if test x$tk != "xno"; then
GUISRC="t_main.c t_tkcmd.c"
else
GUISRC=
fi
if test `uname -s` = Linux;
then
dnl Ckecking for ALSA
...
...
This diff is collapsed.
Click to expand it.
src/m_sched.c
+
4
−
1
View file @
49f5b918
...
...
@@ -28,7 +28,10 @@ int sys_schedblocksize = DEFDACBLKSIZE;
int
sys_usecsincelastsleep
(
void
);
int
sys_sleepgrain
;
int
sched_reopenmeplease
=
0
;
/* request from s_audio for deferred reopen */
void
sched_reopenmeplease
(
void
)
/* request from s_audio for deferred reopen */
{
sys_quit
=
SYS_QUIT_RESTART
;
}
typedef
void
(
*
t_clockmethod
)(
void
*
client
);
...
...
This diff is collapsed.
Click to expand it.
src/s_audio.c
+
5
−
5
View file @
49f5b918
...
...
@@ -68,7 +68,7 @@ static int audio_advance;
static
int
audio_callback
;
void
sched_audio_callbackfn
(
void
);
extern
int
sched_reopenmeplease
;
void
sched_reopenmeplease
(
void
)
;
static
int
audio_isopen
(
void
)
{
...
...
@@ -364,10 +364,11 @@ void sys_close_audio(void)
mmio_close_audio
();
else
#endif
post
(
"sys_close_audio: unknown API %d"
,
sys_audioapi
);
post
(
"sys_close_audio: unknown API %d"
,
sys_audioapi
opened
);
sys_inchannels
=
sys_outchannels
=
0
;
sys_audioapiopened
=
-
1
;
sched_set_using_audio
(
SCHED_AUDIO_NONE
);
audio_state
=
0
;
}
/* open audio using whatever parameters were last used */
...
...
@@ -432,6 +433,7 @@ void sys_reopen_audio( void)
}
else
{
/* fprintf(stderr, "started w/callback %d\n", callback); */
audio_state
=
1
;
sched_set_using_audio
(
(
callback
?
SCHED_AUDIO_CALLBACK
:
SCHED_AUDIO_POLL
));
...
...
@@ -743,7 +745,7 @@ void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv)
newrate
,
newadvance
,
(
newcallback
>=
0
?
newcallback
:
0
));
if
(
!
audio_callback
&&
!
newcallback
)
sys_reopen_audio
();
else
sched_reopenmeplease
=
1
;
else
sched_reopenmeplease
()
;
}
void
sys_listdevs
(
void
)
...
...
@@ -820,7 +822,6 @@ void glob_audio_setapi(void *dummy, t_floatarg f)
else
if
(
audio_isopen
())
{
sys_close_audio
();
audio_state
=
0
;
}
}
...
...
@@ -837,7 +838,6 @@ void sys_set_audio_state(int onoff)
if
(
audio_isopen
())
sys_close_audio
();
}
audio_state
=
onoff
;
}
void
sys_get_audio_apis
(
char
*
buf
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment