diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-10-09 11:54:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-10-09 11:54:05 +0000 |
| commit | c004bf7bab02b625671856eb8af88d69fcebe919 (patch) | |
| tree | 6a0f4e3fbf2116f9f9fe3c943be9a1e3924ccc3a /multimedia/openmovieeditor | |
| parent | - Fix two bugs (with code cleanup) (diff) | |
- Fix build with gcc 4.2
PR: 117002
Submitted by: Dmitry Marakasov <amdmi3@amdmi3.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=201163
Diffstat (limited to 'multimedia/openmovieeditor')
| -rw-r--r-- | multimedia/openmovieeditor/files/patch-src-JackPlaybackCore.cxx | 11 | ||||
| -rw-r--r-- | multimedia/openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/multimedia/openmovieeditor/files/patch-src-JackPlaybackCore.cxx b/multimedia/openmovieeditor/files/patch-src-JackPlaybackCore.cxx new file mode 100644 index 000000000000..62d581c7824c --- /dev/null +++ b/multimedia/openmovieeditor/files/patch-src-JackPlaybackCore.cxx @@ -0,0 +1,11 @@ +--- src/JackPlaybackCore.cxx.orig Fri Oct 5 01:19:48 2007 ++++ src/JackPlaybackCore.cxx Fri Oct 5 01:20:24 2007 +@@ -291,7 +291,7 @@ + * possibly resulting in a backwards seek. + */ + int spin = 1000000; +- while (abs(jack_poll_frame()-m_currentFrame) > 2 && spin-- > 0 ); ++ while (::llabs(jack_poll_frame()-m_currentFrame) > 2 && spin-- > 0 ); + } + if (g_use_jack_transport) jack_play(); + diff --git a/multimedia/openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx b/multimedia/openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx new file mode 100644 index 000000000000..d8f2c1b92c00 --- /dev/null +++ b/multimedia/openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx @@ -0,0 +1,11 @@ +--- src/PortAudioPlaybackCore.cxx.orig Fri Oct 5 01:19:48 2007 ++++ src/PortAudioPlaybackCore.cxx Fri Oct 5 01:20:55 2007 +@@ -187,7 +187,7 @@ + m_lastFrame++; + pthread_mutex_lock( &condition_mutex ); + int64_t diff = m_lastFrame - m_currentFrame; +- if ( abs( diff ) > VIDEO_DRIFT_LIMIT ) { ++ if ( ::llabs( diff ) > VIDEO_DRIFT_LIMIT ) { + if ( diff > 0 ) { + while( ( m_lastFrame - m_currentFrame ) > VIDEO_DRIFT_LIMIT && Pa_StreamActive( g_stream ) ) { + pthread_cond_wait( &condition_cond, &condition_mutex ); |