Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increased video timeout to 5 seconds #546

Merged
merged 2 commits into from
Mar 15, 2019
Merged

Increased video timeout to 5 seconds #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97fde70
Increased video timeout to 5 seconds
oomek Mar 13, 2019
4780ad9
Fixed Travis error on OSX
oomek Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ matrix:
- os: osx
compiler: gcc
before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ffmpeg sfml libarchive curl; fi
script:
Expand Down
2 changes: 1 addition & 1 deletion src/media.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ void FeVideoImp::video_thread()
// so we flag the video to be restarted on the next tick.
// This prevents displaying only keyframes for several seconds on wake.
//
if ( wait_time < sf::seconds( -2.0f ) )
if ( wait_time < sf::seconds( -5.0f ) )
{
wait_time = sf::seconds( 0 );
far_behind = true;
Expand Down