inline to prevent linker errors when multiple compilation units

Author: pschatzmann

docs/.DS_Store

@@ -31,7 +31,7 @@ struct WAVAudioInfo : AudioBaseInfo {
     uint32_t file_size=0;
 };
 
-const char* wav_mime = "audio/wav";
+inline const char* wav_mime = "audio/wav";
 
 /**
  * @brief Parser for Wav header data

examples/.DS_Store

@@ -13,26 +13,26 @@ namespace audio_tools {
 // Class Configuration
 
 // Define relevant header content
-const char* CONTENT_TYPE = "Content-Type";
-const char* CONTENT_LENGTH = "Content-Length";
-const char* CONNECTION = "Connection";
-const char* CON_CLOSE = "close";
-const char* CON_KEEP_ALIVE = "keep-alive";
-const char* TRANSFER_ENCODING = "Transfer-Encoding";
-const char* CHUNKED = "chunked";
-const char* ACCEPT = "Accept";
-const char* ACCEPT_ALL = "*/*";
-const char* SUCCESS = "Success";
-const char* USER_AGENT = "User-Agent";
-const char* DEFAULT_AGENT = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)";
-const char* HOST_C = "Host";
-const char* ACCEPT_ENCODING = "Accept-Encoding";
-const char* IDENTITY = "identity";
-const char* LOCATION = "Location";
+inline const char* CONTENT_TYPE = "Content-Type";
+inline const char* CONTENT_LENGTH = "Content-Length";
+inline const char* CONNECTION = "Connection";
+inline const char* CON_CLOSE = "close";
+inline const char* CON_KEEP_ALIVE = "keep-alive";
+inline const char* TRANSFER_ENCODING = "Transfer-Encoding";
+inline const char* CHUNKED = "chunked";
+inline const char* ACCEPT = "Accept";
+inline const char* ACCEPT_ALL = "*/*";
+inline const char* SUCCESS = "Success";
+inline const char* USER_AGENT = "User-Agent";
+inline const char* DEFAULT_AGENT = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)";
+inline const char* HOST_C = "Host";
+inline const char* ACCEPT_ENCODING = "Accept-Encoding";
+inline const char* IDENTITY = "identity";
+inline const char* LOCATION = "Location";
 
 
 // Http methods
-const char* methods[] = {"?","GET","HEAD","POST","PUT","DELETE","TRACE","OPTIONS","CONNECT","PATCH",nullptr};
+inline const char* methods[] = {"?","GET","HEAD","POST","PUT","DELETE","TRACE","OPTIONS","CONNECT","PATCH",nullptr};
 
 /**
  * @brief A individual key - value header line 

src/AudioCodecs/CodecWAV.h

@@ -21,7 +21,7 @@ enum I2SSignalType {
   PDM
 };
 
-const char* i2s_formats[] = {"I2S_STD_FORMAT","I2S_LSB_FORMAT","I2S_MSB_FORMAT","I2S_PHILIPS_FORMAT","I2S_RIGHT_JUSTIFIED_FORMAT","I2S_LEFT_JUSTIFIED_FORMAT","I2S_PCM_LONG","I2S_PCM_SHORT"};
+inline const char* i2s_formats[] = {"I2S_STD_FORMAT","I2S_LSB_FORMAT","I2S_MSB_FORMAT","I2S_PHILIPS_FORMAT","I2S_RIGHT_JUSTIFIED_FORMAT","I2S_LEFT_JUSTIFIED_FORMAT","I2S_PCM_LONG","I2S_PCM_SHORT"};
 
 
 /**

src/AudioHttp/HttpHeader.h

@@ -133,9 +133,10 @@ class FaustStream : public AudioStreamX {
             allocateFloatBuffer(samples, with_output_buffer);
             int16_t *data16 = (int16_t*) write_data;
             // convert to float
-            for(int j=0;j<samples;j+=cfg.channels){
+            int frameCount = samples/cfg.channels;
+            for(int j=0;j<frameCount;j++){
                 for(int i=0;i<cfg.channels;i++){
-                    p_buffer[i][j] =  static_cast<FAUSTFLOAT>(data16[j+i])/32767.0;
+                    p_buffer[i][j] =  static_cast<FAUSTFLOAT>(data16[(j*cfg.channels)+i])/32767.0;
                 }
             }
             FAUSTFLOAT** p_float_out = with_output_buffer ? p_buffer_out : p_buffer; 
@@ -260,9 +261,10 @@ class FaustStream : public AudioStreamX {
     /// Converts the float buffer to int16 values
     void convertFloatBufferToInt16(int samples, void *data, FAUSTFLOAT**p_float_out){
         int16_t *data16 = (int16_t*) data;
-        for (int j=0;j<samples;j+=cfg.channels){
+        int frameCount = samples/cfg.channels;
+        for (int j=0;j<frameCount;j++){
             for (int i=0;i<cfg.channels;i++){
-                data16[j+i]=p_float_out[i][j]*32767;
+                data16[(j*cfg.channels)+i]=p_float_out[i][j]*32767;
             }
         }
     }

src/AudioI2S/I2SConfig.h

@@ -10,10 +10,10 @@ enum ID3TypeSelection { SELECT_ID3V1=0b001, SELECT_ID3V2=0b010, SELECT_ID3=0b011
 enum MetaDataType { Title, Artist, Album, Genre, Name, Description };
 
 /// Test Description for meta info
-const char* MetaDataTypeStr[] = {"Title", "Artist", "Album", "Genre","Name", "Description"};
+inline const char* MetaDataTypeStr[] = {"Title", "Artist", "Album", "Genre","Name", "Description"};
 
 /// Converts the MetaDataType to a string
-const char *toStr(MetaDataType t){
+inline const char *toStr(MetaDataType t){
     return MetaDataTypeStr[t];
 }
 

src/AudioLibs/AudioFaust.h

@@ -14,7 +14,7 @@
 namespace audio_tools {
 
 /// String array with genres
-const char *genres[] = { "Classic Rock", "Country", "Dance", "Disco", "Funk", "Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies", "Other", "Pop", "R&B", "Rap", "Reggae", "Rock", "Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "Alternative Rock", "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Insdustiral", "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native US", "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde", "Gothic Rock", "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band", "Chorus", "Easy Listening", "Acoustic","Humour", "Speech", "Chanson", "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus", "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba", "Folklore", "Ballad", "Power Ballad", "Rhytmic Soul", "Freestyle", "Duet", "Punk Rock", "Drum Solo", "Acapella", "Euro-House", "Dance Hall", "Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk", "Polsk Punk", "Beat", "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover", "Contemporary C", "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop", "SynthPop" };
+inline const char *genres[] = { "Classic Rock", "Country", "Dance", "Disco", "Funk", "Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies", "Other", "Pop", "R&B", "Rap", "Reggae", "Rock", "Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "Alternative Rock", "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Insdustiral", "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native US", "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde", "Gothic Rock", "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band", "Chorus", "Easy Listening", "Acoustic","Humour", "Speech", "Chanson", "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus", "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba", "Folklore", "Ballad", "Power Ballad", "Rhytmic Soul", "Freestyle", "Duet", "Punk Rock", "Drum Solo", "Acapella", "Euro-House", "Dance Hall", "Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk", "Polsk Punk", "Beat", "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover", "Contemporary C", "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop", "SynthPop" };
 
 /// current status of the parsing
 enum ParseStatus { TagNotFound, PartialTagAtTail, TagFoundPartial, TagFoundComplete, TagProcessed};
@@ -266,7 +266,7 @@ class MetaDataID3V1  : public MetaDataID3Base {
 #define ExperimentalIndicatorFlag 0x10
 
 /// Relevant v2 Tags        
-const char* id3_v2_tags[] = {"TALB", "TOPE", "TIT2", "TCON"};
+inline const char* id3_v2_tags[] = {"TALB", "TOPE", "TIT2", "TCON"};
 
 
 /// ID3 verion 2 TAG Header (10 bytes)
@@ -275,7 +275,6 @@ struct ID3v2 {
     uint8_t version[2];
     uint8_t flags;
     uint8_t size[4];
-
 };
 
 // /// ID3 verion 2 Extended Header 
@@ -307,7 +306,7 @@ struct ID3v2FrameString {
     uint8_t encoding; // encoding byte for strings
 }; 
 
-const int ID3FrameSize = 11;
+inline const int ID3FrameSize = 11;
 
 /**
  * @brief Simple ID3 Meta Data API which supports ID3 V2: We only support the "TALB", "TOPE", "TIT2", "TCON" tags

src/AudioMetaData/AbstractMetaData.h

@@ -127,14 +127,14 @@ class PWMAudioStreamAVR : public PWMAudioStreamBase {
 };
 
 /// separate method that can be defined as friend so that we can access protected information
-void defaultPWMAudioOutputCallback(){
+inline void defaultPWMAudioOutputCallback(){
     if (accessAudioPWM!=nullptr && accessAudioPWM->is_timer_started){
         accessAudioPWM->playNextFrame();
     }
 }
 
 /// timer callback: write the next frame to the pins
-ISR(TIMER1_COMPA_vect){
+inline ISR(TIMER1_COMPA_vect){
     defaultPWMAudioOutputCallback();
     TimerAlarmRepeatingAVR::tickerCallback();
 

src/AudioMetaData/MetaDataID3.h

@@ -90,7 +90,7 @@ struct PWMConfig : public AudioBaseInfo {
         Pins pins_data;
 
 
-} default_config;
+} inline default_config;
 
 
 /**