Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

fixed: If player wasn't playing at normal speed while selecting a new it... #1928

Merged
merged 1 commit into from

2 participants

@arnova
Collaborator

...em, the play speed would not properly be reset to normal.

arnova fixed: If player wasn't playing at normal speed while selecting a new…
… item, the play speed would not properly be reset to normal
6dd90a0
@davilla
Collaborator

Ack the removal of m_iPlaySpeed, it borks what happens inside SetPlaySpeed.
Nak the move of it below SetPlaySpeed, SetPlaySpeed should be already be setting m_iPlaySpeed if it's different than what was passed in. Why is this needed ? Did SetPlaySpeed set it wrong ? Seems that one should just remove the m_iPlaySpeed entirely.

Collaborator

My reasoning was that SetPlaySpeed() will only update m_iPlaySpeed when there already is a player playing (m_player != NULL). I suspected that may cause problems. The only way to workaround that is having SetPlaySpeed() ALWAYS update m_iPlaySpeed regardless of the state of m_player, but I'm not entirely sure whether doing that is 100% safe?

@davilla davilla merged commit dae8f6e into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 13, 2012
  1. fixed: If player wasn't playing at normal speed while selecting a new…

    arnova authored
    … item, the play speed would not properly be reset to normal
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 1 deletion.
  1. +3 −1 xbmc/Application.cpp
View
4 xbmc/Application.cpp
@@ -3856,7 +3856,9 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
g_settings.m_currentVideoSettings = g_settings.m_defaultVideoSettings;
// see if we have saved options in the database
- m_iPlaySpeed = 1;
+ SetPlaySpeed(1);
+ m_iPlaySpeed = 1; // Reset both CApp's & Player's speed else we'll get confused
+
*m_itemCurrentFile = item;
m_nextPlaylistItem = -1;
m_currentStackPosition = 0;
Something went wrong with that request. Please try again.