Diff: POKITTO_CORE/PokittoSound.cpp

Revision:

58:5f58a2846a20

Parent:

52:c04087025cab

diff -r 63853054a4d9 -r 5f58a2846a20 POKITTO_CORE/PokittoSound.cpp
--- a/POKITTO_CORE/PokittoSound.cpp	Tue Oct 02 20:38:50 2018 +0000
+++ b/POKITTO_CORE/PokittoSound.cpp	Sun Oct 07 10:06:28 2018 +0000
@@ -43,7 +43,7 @@
  *
  * License for Gamebuino-identical code:
  *
- * (C) Copyright 2014 Aurélien Rodot. All rights reserved.
+ * (C) Copyright 2014 Aur�lien Rodot. All rights reserved.
  *
  * This file is part of the Gamebuino Library (http://gamebuino.com)
  *
@@ -80,9 +80,9 @@
 /** discrete hardware volume control **/
 
 uint8_t Pokitto::discrete_vol = 0;
-uint8_t const Pokitto::discrete_vol_levels[8]      {0,32,64,96,128,160,192,224};
-uint8_t const Pokitto::discrete_vol_hw_levels[8]   {0,27,64,96,36,117,127,127};
-uint8_t const Pokitto::discrete_vol_multipliers[8] {0,127,127,127,192,192,255,255};
+uint8_t const Pokitto::discrete_vol_levels[]      = {0,32,64,96,128,160,192,224};
+uint8_t const Pokitto::discrete_vol_hw_levels[]   = {0,27,64,96,36,117,127,127};
+uint8_t const Pokitto::discrete_vol_multipliers[] = {0,127,127,127,192,192,255,255};
 
 Pokitto::Core _soundc;
 
@@ -135,6 +135,7 @@
 uint8_t Sound::chanVolumes[NUM_CHANNELS];
 
 #if (POK_ENABLE_SOUND < 1)
+ #undef NUM_CHANNELS
  #define NUM_CHANNELS 0
 #endif
 
@@ -894,6 +895,7 @@
             return 1;
     } else return 0; //no stream
     #endif // POK_STREAMING_MUSIC
+    return 0;
 }
 
 void Sound::pauseMusicStream() {