diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2000-12-09 09:55:17 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2000-12-09 09:55:17 +0000 |
| commit | deca632a5a3ab3f2e86f2a2854d2cdbaf3b6eb78 (patch) | |
| tree | 09b3a55465515cd64b0a8dfe28c8839632cd4371 | |
| parent | 6db05779c505ec50a3e166179f109e6b74ea87a1 (diff) | |
| download | nautilus-deca632a5a3ab3f2e86f2a2854d2cdbaf3b6eb78.tar.gz | |
Fixed bug 5102, Changing to or from Music View advances song in second
2000-12-08 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 5102, Changing to or from Music View advances song in
second window.
* components/music/nautilus-music-view.c: (stop_playing_file):
Only stop playback if playback is occurring. Otherwise
esd get's confused and temporarily halts playback causeing
the status callback to advnace the song counter in any music
view that is playing.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | components/music/nautilus-music-view.c | 10 |
2 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2000-12-08 Gene Z. Ragan <gzr@eazel.com> + + Fixed bug 5102, Changing to or from Music View advances song in + second window. + + * components/music/nautilus-music-view.c: (stop_playing_file): + Only stop playback if playback is occurring. Otherwise + esd get's confused and temporarily halts playback causeing + the status callback to advnace the song counter in any music + view that is playing. + 2000-12-08 Andy Hertzfeld <andy@eazel.com> * src/nautilus-sidebar-title.c: (update_emblems): diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index 0f68cc60b..756fcc67a 100644 --- a/components/music/nautilus-music-view.c +++ b/components/music/nautilus-music-view.c @@ -1789,8 +1789,14 @@ start_playing_file (NautilusMusicView *music_view, const char *file_name) static void stop_playing_file (NautilusMusicView *music_view) { - mpg123_stop (); - set_player_state (music_view, PLAYER_STOPPED); + PlayerState state; + + state = get_player_state (music_view); + + if (state == PLAYER_PLAYING || state == PLAYER_PAUSED) { + mpg123_stop (); + set_player_state (music_view, PLAYER_STOPPED); + } } static PlayerState |