From 1630cf0ed20ea8df879327af1275ff281a9bc7e0 Mon Sep 17 00:00:00 2001 From: Krzysztof Dermont Date: Sat, 21 Jun 2014 02:58:41 +0200 Subject: Implemented libsndfile loader in PhysFS --- src/common/resources/sndfile.h | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/common/resources/sndfile.h (limited to 'src/common/resources/sndfile.h') diff --git a/src/common/resources/sndfile.h b/src/common/resources/sndfile.h new file mode 100644 index 0000000..5ea6ccc --- /dev/null +++ b/src/common/resources/sndfile.h @@ -0,0 +1,54 @@ +// * This file is part of the COLOBOT source code +// * Copyright (C) 2014 Polish Portal of Colobot (PPC) +// * +// * 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/. + +#pragma once + +#include +#include +#include + + +class CSNDFile +{ +public: + CSNDFile(const std::string &filename); + virtual ~CSNDFile(); + + SF_INFO &GetFileInfo(); + bool IsOpen(); + std::string &GetLastError(); + sf_count_t Read(short int *ptr, sf_count_t items); + +private: + static sf_count_t SNDLength(void *data); + static sf_count_t SNDSeek(sf_count_t offset, int whence, void *data); + static sf_count_t SNDRead(void *ptr, sf_count_t count, void *data); + static sf_count_t SNDWrite(const void *ptr, sf_count_t count, void *data); + static sf_count_t SNDTell(void *data); + + SF_INFO m_file_info; + SNDFILE *m_snd_file; + PHYSFS_File *m_file; + std::string m_last_error; + + SF_VIRTUAL_IO snd_callbacks = { + SNDLength, + SNDSeek, + SNDRead, + SNDWrite, + SNDTell + }; +}; -- cgit v1.2.3-1-g7c22 From 6a1ceba8c0914691ebc873fd666e7cde1cffdb64 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 7 Sep 2014 19:26:06 +0200 Subject: Some cleaning up --- src/common/resources/sndfile.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/common/resources/sndfile.h') diff --git a/src/common/resources/sndfile.h b/src/common/resources/sndfile.h index 5ea6ccc..5fc00f4 100644 --- a/src/common/resources/sndfile.h +++ b/src/common/resources/sndfile.h @@ -38,7 +38,6 @@ private: static sf_count_t SNDRead(void *ptr, sf_count_t count, void *data); static sf_count_t SNDWrite(const void *ptr, sf_count_t count, void *data); static sf_count_t SNDTell(void *data); - SF_INFO m_file_info; SNDFILE *m_snd_file; PHYSFS_File *m_file; -- cgit v1.2.3-1-g7c22 From 342210b0628d417a32f375efbfbd91f5537ab148 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Tue, 7 Oct 2014 23:25:37 +0200 Subject: GCC 4.6 compilation fixes --- src/common/resources/sndfile.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/common/resources/sndfile.h') diff --git a/src/common/resources/sndfile.h b/src/common/resources/sndfile.h index 5fc00f4..7d6d589 100644 --- a/src/common/resources/sndfile.h +++ b/src/common/resources/sndfile.h @@ -42,12 +42,5 @@ private: SNDFILE *m_snd_file; PHYSFS_File *m_file; std::string m_last_error; - - SF_VIRTUAL_IO snd_callbacks = { - SNDLength, - SNDSeek, - SNDRead, - SNDWrite, - SNDTell - }; + SF_VIRTUAL_IO m_snd_callbacks; }; -- cgit v1.2.3-1-g7c22 From 47ea8a1175488564c11e09f71447cb19515c6e6c Mon Sep 17 00:00:00 2001 From: krzys-h Date: Wed, 15 Oct 2014 21:14:34 +0200 Subject: Updated some more license headers --- src/common/resources/sndfile.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'src/common/resources/sndfile.h') diff --git a/src/common/resources/sndfile.h b/src/common/resources/sndfile.h index 7d6d589..f083666 100644 --- a/src/common/resources/sndfile.h +++ b/src/common/resources/sndfile.h @@ -1,18 +1,21 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2014 Polish Portal of Colobot (PPC) -// * -// * 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 file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * 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://gnu.org/licenses + */ #pragma once -- cgit v1.2.3-1-g7c22