0.9.2-rc2

src/playlist.c

@@ -761,6 +761,14 @@ int setPlaylistRepeatStatus(FILE * fp, int status) {
 		return -1;
 	}
 
+	if(playlist_state==PLAYLIST_STATE_PLAY) {
+		if(playlist.repeat && !status && playlist.queued==0) {
+			lockPlaylistInteraction();
+			clearPlayerQueue();
+			unlockPlaylistInteraction();
+		}
+	}
+
 	playlist.repeat = status;
 
 	return 0;
@@ -844,7 +852,7 @@ void orderPlaylist() {
 
 	blockTermSignal();
 	if(playlist_state==PLAYLIST_STATE_PLAY) {
-		if(playlist.queued>0) {
+		if(playlist.queued>=0) {
 			lockPlaylistInteraction();
 			clearPlayerQueue();
 			unlockPlaylistInteraction();
@@ -1168,7 +1176,7 @@ int seekSongInPlaylist(FILE * fp, int song, float time) {
 	playlist_errorCount = 0;
 
 	if(playlist_state == PLAYLIST_STATE_PLAY) {
-		if(playlist.queued>0) {
+		if(playlist.queued>=0) {
 			lockPlaylistInteraction();
 			clearPlayerQueue();
 			unlockPlaylistInteraction();

src/volume.c

@@ -44,7 +44,7 @@
 int volume_mixerType = VOLUME_MIXER_TYPE_NULL;
 char * volume_mixerDevice;
 
-#ifndef NO_OSSMIXER
+#ifndef NO_OSS_MIXER
 int volume_ossFd;
 int volume_ossControl = SOUND_MIXER_VOLUME;
 #endif