mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-07 03:57:07 +03:00
Merge remote-tracking branch 'origin/master' into master-cmake
Conflicts: README.md components/config/config.c components/driver_bt/bt_app_sink.c components/raop/raop.c components/services/audio_controls.c main/platform_esp32.h
This commit is contained in:
@@ -1,19 +1,9 @@
|
||||
/*
|
||||
*
|
||||
* (c) Philippe 2019, philippe_44@outlook.com
|
||||
* (c) Philippe 2019, philippe_44@outlook.com
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -957,4 +947,5 @@ static void on_dmap_string(void *ctx, const char *code, const char *name, const
|
||||
return q - (unsigned char *) data;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------------*/
|
||||
static void on_dmap_string(void *ctx, const char *code, const char *name, const char *buf, size_t len) {
|
||||
|
||||
Reference in New Issue
Block a user