Merge branch 'main' of https://github.com/pschatzmann/arduino-audio-tools into main

Author: pschatzmann

src/AudioConfig.h

@@ -175,6 +175,9 @@
 #if ESP_IDF_VERSION_MAJOR < 4 && !defined(I2S_COMM_FORMAT_STAND_I2S)
 # define I2S_COMM_FORMAT_STAND_I2S (I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_LSB)
 # define I2S_COMM_FORMAT_STAND_MSB (I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_MSB)
+# define I2S_COMM_FORMAT_STAND_PCM_LONG (I2S_COMM_FORMAT_PCM | I2S_COMM_FORMAT_PCM_LONG)
+# define I2S_COMM_FORMAT_STAND_PCM_SHORT (I2S_COMM_FORMAT_PCM | I2S_COMM_FORMAT_PCM_SHORT)
+
 typedef int eps32_i2s_sample_rate_type;
 #else
 typedef uint32_t eps32_i2s_sample_rate_type;

src/AudioI2S/I2SESP32.h

@@ -52,7 +52,7 @@ class I2SBase {
             .dma_buf_len = I2S_BUFFER_SIZE,
             .use_apll = (bool) cfg.use_apll,
             .tx_desc_auto_clear = I2S_AUTO_CLEAR, 
-            .fixed_mclk = (eps32_i2s_sample_rate_type) (cfg.use_apll ? cfg.sample_rate * cfg.apll_frequency_factor : 0 )
+            .fixed_mclk = (int) (cfg.use_apll ? cfg.sample_rate * cfg.apll_frequency_factor : 0 )
 
       };
       i2s_config = i2s_config_new;
@@ -223,9 +223,9 @@ class I2SBase {
           case I2S_LEFT_JUSTIFIED_FORMAT:
             return (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_MSB;
           case I2S_PCM_LONG:
-            return (i2s_comm_format_t) I2S_COMM_FORMAT_PCM_LONG;
+            return (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_PCM_LONG;
           case I2S_PCM_SHORT:
-            return (i2s_comm_format_t) I2S_COMM_FORMAT_PCM_SHORT;
+            return (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_PCM_SHORT;
 
           default:
             LOGE("unsupported mode");

src/AudioTools.h

@@ -39,12 +39,11 @@
  * @brief typedefs for Default
  * 
  */
-namespace audio_tools {
+
+using namespace audio_tools;
 
 #if defined(__linux__) || defined(_WIN32) || defined(__APPLE__)
 typedef PortAudioStream DefaultStream;
 #elif defined(ESP32) || defined(ESP8266) || defined(__SAMD21G18A__)
 typedef I2SStream DefaultStream;
 #endif
-
-}

src/AudioTools/AudioPlayer.h

@@ -59,6 +59,11 @@ namespace audio_tools {
             return selectStream(index);
         }
 
+        /// same as selectStream - I just prefer this name
+        virtual Stream* selectStream(char* path, char* fileName) {
+            return selectStream(path,fileName);
+        }
+
         /// Sets the timeout which is triggering to move to the next stream. - the default value is 500 ms
         virtual void setTimeoutAutoNext(int millisec) {
             timeout_auto_next_value = millisec;
@@ -149,7 +154,7 @@ namespace audio_tools {
 	typedef File AudioFile;
 #elif SD_FAT_TYPE == 1
 	typedef SdFat32 AudioFs;
-	typedef File32 AudioDir;
+	//typedef File32 AudioDir;
 	typedef File32 AudioFile;
 #elif SD_FAT_TYPE == 2
 	typedef SdExFat AudioFs;
@@ -205,12 +210,19 @@ namespace audio_tools {
         virtual Stream* selectStream(int index) override {
             idx_pos = index<0 ? 0 : index;
             file.close();
-            file = getFile(start_path, idx_pos);
+            file = getFileByPos(start_path, idx_pos);
             file.getName(file_name, MAX_FILE_LEN);
             LOGW("-> selectStream: %d '%s'", idx_pos, file_name);
             return file ? &file : nullptr;
         }
 
+        virtual Stream* selectStream(char* path, char* fileName) override {
+            file.close();
+            file = getFileByPath(path, fileName);
+            LOGW("-> selectStream: %s%s", path, fileName);
+            return file ? &file : nullptr;
+        }
+
         /// Defines the regex filter criteria for selecting files. E.g. ".*Bob Dylan.*" 
         void setFileFilter(const char* filter) {
             file_name_pattern = (char*)filter;
@@ -251,7 +263,7 @@ namespace audio_tools {
         }
 
         /// Determines the file at the indicated index (starting with 0)
-        AudioFile getFile(const char* dirStr, int pos) {
+        AudioFile getFileByPos(const char* dirStr, int pos) {
             AudioFile dir;
             AudioFile result;
             if (sd.exists(dirStr)){
@@ -270,6 +282,31 @@ namespace audio_tools {
             return result;
         }
 
+        AudioFile getFileByPath(char* path, char* fileName) {
+            AudioFile dir;
+            if (!dir.open(path)) {//("/21/" , "001.mp3")
+                LOGE("directory: %s not open", path);
+            }
+            else
+            {
+                if (!dir.isDir()) {
+                    LOGE("directory: %s is not dictory", path);
+                }
+                else
+                {
+                    if (!file.open(&dir, fileName, O_RDWR)) {
+                        LOGE("file: %s not open", path);
+                    }
+                    else
+                    {
+                        LOGD("-> getFileByPath: '%s': %d", path, fileName);
+                    }
+                }
+            }
+            dir.close();
+            return file;
+        }
+
         /// Recursively walk the directory tree to find the file at the indicated pos.
         void getFileAtIndex(AudioFile dir, size_t pos, size_t& idx, AudioFile& result) {
             LOGD("%s: %d", LOG_METHOD, idx);
@@ -308,6 +345,7 @@ namespace audio_tools {
                 }
             }
         }
+
     };
 
 #endif
@@ -608,6 +646,14 @@ namespace audio_tools {
             return active;
         }
 
+        /// moves to selected file
+        virtual bool setPath(char* path, char* fileName) {
+            LOGD(LOG_METHOD);
+            previous_stream = false;
+            active = setStream(p_source->selectStream(path, fileName));
+            return active;
+        }
+
         /// moves to previous file
         virtual bool previous(int offset=1) {
             LOGD(LOG_METHOD);