Issue #407 - fixed fe.Image.video_playing attribute

- wasn't able to reproduce freezing reported in the issue, however
  I was able to fix the other incorrect behaviour reported

src/fe_image.cpp

@@ -170,7 +170,7 @@ bool FeBaseTextureContainer::fix_masked_image()
 	return false;
 }
 
-bool FeBaseTextureContainer::tick( FeSettings *feSettings, bool play_movies, bool ok_to_start )
+bool FeBaseTextureContainer::tick( FeSettings *feSettings, bool play_movies )
 {
 	return false;
 }
@@ -650,7 +650,7 @@ void FeTextureContainer::internal_update_selection( FeSettings *feSettings )
 	notify_texture_change();
 }
 
-bool FeTextureContainer::tick( FeSettings *feSettings, bool play_movies, bool ok_to_start )
+bool FeTextureContainer::tick( FeSettings *feSettings, bool play_movies )
 {
 #ifndef NO_SWF
 	if (( play_movies ) && ( m_swf ))
@@ -665,8 +665,7 @@ bool FeTextureContainer::tick( FeSettings *feSettings, bool play_movies, bool ok
 		&& ( m_movie ))
 	{
 		if (( m_movie_status > 0 )
-			&& ( m_movie_status < PLAY_COUNT )
-			&& ( ok_to_start ))
+			&& ( m_movie_status < PLAY_COUNT ))
 		{
 			//
 			// We skip the first few "ticks" after the movie
@@ -677,7 +676,7 @@ bool FeTextureContainer::tick( FeSettings *feSettings, bool play_movies, bool ok
 			m_movie_status++;
 			return false;
 		}
-		else if (( m_movie_status == PLAY_COUNT ) && ( ok_to_start ))
+		else if ( m_movie_status == PLAY_COUNT )
 		{
 			m_movie_status++;
 
@@ -704,12 +703,21 @@ void FeTextureContainer::set_play_state( bool play )
 #ifndef NO_MOVIE
 	if (m_movie)
 	{
-		if ( m_movie_status >= PLAY_COUNT )
+		if ( play == get_play_state() )
+			return;
+
+		if ( m_movie_status > PLAY_COUNT )
 		{
 			if ( play )
+			{
+				m_movie->setLoop( !(m_video_flags & VF_NoLoop) );
 				m_movie->play();
+			}
 			else
+			{
+				m_movie->setLoop( false );
 				m_movie->stop();
+			}
 		}
 		else if ( m_movie_status >= 0 )
 		{
@@ -735,7 +743,7 @@ bool FeTextureContainer::get_play_state() const
 #ifndef NO_MOVIE
 	if ( m_movie )
 	{
-		if ( m_movie_status >= PLAY_COUNT )
+		if ( m_movie_status > PLAY_COUNT )
 			return m_movie->is_playing();
 		else
 			// if status > 0, we are in the process of starting to play

src/fe_image.hpp

@@ -56,7 +56,7 @@ class FeBaseTextureContainer
 
 	virtual void on_new_list( FeSettings *, bool new_display )=0;
 
-	virtual bool tick( FeSettings *feSettings, bool play_movies, bool ok_to_start ); // returns true if redraw required
+	virtual bool tick( FeSettings *feSettings, bool play_movies ); // returns true if redraw required
 
 	virtual void set_play_state( bool play );
 	virtual bool get_play_state() const;
@@ -124,7 +124,7 @@ class FeTextureContainer : public FeBaseTextureContainer
 	void on_end_navigation( FeSettings *feSettings );
 	void on_new_list( FeSettings *, bool );
 
-	bool tick( FeSettings *feSettings, bool play_movies, bool ok_to_start ); // returns true if redraw required
+	bool tick( FeSettings *feSettings, bool play_movies ); // returns true if redraw required
 	void set_play_state( bool play );
 	bool get_play_state() const;
 	void set_vol( float vol );

src/fe_present.cpp

@@ -1065,7 +1065,7 @@ bool FePresent::video_tick()
 	for ( std::vector<FeBaseTextureContainer *>::iterator itm=m_texturePool.begin();
 			itm != m_texturePool.end(); ++itm )
 	{
-		if ( (*itm)->tick( m_feSettings, m_playMovies, true ) )
+		if ( (*itm)->tick( m_feSettings, m_playMovies ) )
 			ret_val=true;
 	}
 

src/media.cpp

@@ -874,7 +874,7 @@ void FeMedia::close()
 bool FeMedia::is_playing()
 {
 	if ((m_video) && (!m_video->at_end))
-		return true;
+		return (m_video->run_video_thread);
 
 	return ((m_audio) && (sf::SoundStream::getStatus() == sf::SoundStream::Playing));
 }