Commit Diff

Commit:
ae5d742e5f800f8bd0d66b28c1e090b0fb8e1a29
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
...and unbreak ogg vorbis too... i'm seriously shocked at how bad i did the play_* refactoring. missed too many details.
Actions:
Patch | Tree
commit - 74a7482cb0582d5afba526ed7a08cd6fe4e79e1c
commit + ae5d742e5f800f8bd0d66b28c1e090b0fb8e1a29
blob - cb40650d64725a03be62ba9d78d10644e0191df6
blob + db83d6fec72ead37511643104613bd1b092e035e
--- player_oggvorbis.c
+++ player_oggvorbis.c
@@ -67,15 +67,15 @@ play_oggvorbis(int fd)
 		err(1, "player_setrate");
 
 	while (!eof) {
-		long ret;
+		long r;
 
-		ret = ov_read(&vf, pcmout, sizeof(pcmout), 0, 2, 1,
+		r = ov_read(&vf, pcmout, sizeof(pcmout), 0, 2, 1,
 		    &current_section);
-		if (ret == 0)
+		if (r == 0)
 			eof = 1;
-		else if (ret > 0) {
+		else if (r > 0) {
 			/* TODO: deal with sample rate changes */
-			if (!play(pcmout, ret)) {
+			if (!play(pcmout, r)) {
 				ret = 1;
 				break;
 			}