Set num channels to 1 if not specified

thess · Aug 27, 2018 · 59d3471 · 59d3471
1 parent 7d33e31
commit 59d3471
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 AC_INIT([pianod],
-	174.07-sc,
+	174.08-sc,
 	[[email protected]],
 	,[http://deviousfish.com/pianod])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])

diff --git a/src/player.c b/src/player.c
@@ -248,7 +248,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, size_t size,
 			player->songPlayed += (unsigned long long int) frameInfo.samples *
 					(unsigned long long int) BAR_PLAYER_MS_TO_S_FACTOR /
 					(unsigned long long int) player->samplerate /
-					(unsigned long long int) player->channels;
+					(unsigned long long int) (player->channels ? player->channels : 1);
 		}
 		if (player->sampleSizeCurr >= player->sampleSizeN) {
 			/* no more frames, drop data */
@@ -335,7 +335,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, size_t size,
 					player->songDuration = (unsigned long long int) player->sampleSizeN *
 							4096LL * (unsigned long long int) BAR_PLAYER_MS_TO_S_FACTOR /
 							(unsigned long long int) player->samplerate /
-							(unsigned long long int) player->channels;
+							(unsigned long long int) (player->channels ? player->channels : 1);
 					break;
 				} else {
 					memcpy (&player->sampleSize[player->sampleSizeCurr],