Skip to content

A few small compilation fixes #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikreiman wants to merge 4 commits into
base: master
Choose a base branch
from
Open

A few small compilation fixes #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3256be1
Remove enum typedef
nikreiman Mar 6, 2020
c9cac7f
Add include guard around unistd.h
nikreiman Mar 6, 2020
a24ab23
Rename UUID -> af_UUID
nikreiman Mar 6, 2020
29b2093
Include <algorithm> in BlockCodec.cpp
nikreiman Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libaudiofile/File.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <stdio.h>

class FilePOSIX : public File
Expand Down
4 changes: 2 additions & 2 deletions libaudiofile/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ libaudiofile_la_SOURCES = \
Tag.h \
Track.cpp \
Track.h \
UUID.cpp \
UUID.h \
af_UUID.cpp \
af_UUID.h \
VOC.cpp \
VOC.h \
WAVE.cpp \
Expand Down
16 changes: 8 additions & 8 deletions libaudiofile/WAVE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "Setup.h"
#include "Tag.h"
#include "Track.h"
#include "UUID.h"
#include "af_UUID.h"
#include "byteorder.h"
#include "util.h"

Expand Down Expand Up @@ -127,22 +127,22 @@ static const _AFfilesetup waveDefaultFileSetup =
NULL /* miscellaneous */
};

static const UUID _af_wave_guid_pcm =
static const af_UUID _af_wave_guid_pcm =
{{
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
}};
static const UUID _af_wave_guid_ieee_float =
static const af_UUID _af_wave_guid_ieee_float =
{{
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
}};
static const UUID _af_wave_guid_ulaw =
static const af_UUID _af_wave_guid_ulaw =
{{
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
}};
static const UUID _af_wave_guid_alaw =
static const af_UUID _af_wave_guid_alaw =
{{
0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
Expand Down Expand Up @@ -357,7 +357,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
readU16(&reserved);
uint32_t channelMask;
readU32(&channelMask);
UUID subformat;
af_UUID subformat;
readUUID(&subformat);
if (subformat == _af_wave_guid_pcm)
{
Expand Down Expand Up @@ -1534,12 +1534,12 @@ status WAVEFile::writeInit(AFfilesetup setup)
return AF_SUCCEED;
}

bool WAVEFile::readUUID(UUID *u)
bool WAVEFile::readUUID(af_UUID *u)
{
return m_fh->read(u->data, 16) == 16;
}

bool WAVEFile::writeUUID(const UUID *u)
bool WAVEFile::writeUUID(const af_UUID *u)
{
return m_fh->write(u->data, 16) == 16;
}
Expand Down
6 changes: 3 additions & 3 deletions libaudiofile/WAVE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern const InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS];
#define _AF_WAVE_NUM_COMPTYPES 4
extern const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES];

struct UUID;
struct af_UUID;

class WAVEFile : public _AFfilehandle
{
Expand Down Expand Up @@ -86,8 +86,8 @@ class WAVEFile : public _AFfilehandle
status writeCues();
status writeData();

bool readUUID(UUID *g);
bool writeUUID(const UUID *g);
bool readUUID(af_UUID *g);
bool writeUUID(const af_UUID *g);

bool writeZString(const char *);
size_t zStringLength(const char *);
Expand Down
8 changes: 4 additions & 4 deletions libaudiofile/UUID.cpp → libaudiofile/af_UUID.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
*/

#include "config.h"
#include "UUID.h"
#include "af_UUID.h"

#include <stdio.h>
#include <string.h>

bool UUID::operator==(const UUID &u) const
bool af_UUID::operator==(const af_UUID &u) const
{
return !memcmp(data, u.data, 16);
}

bool UUID::operator!=(const UUID &u) const
bool af_UUID::operator!=(const af_UUID &u) const
{
return memcmp(data, u.data, 16) != 0;
}

std::string UUID::name() const
std::string af_UUID::name() const
{
char s[37];
uint32_t u1 =
Expand Down
7 changes: 3 additions & 4 deletions libaudiofile/UUID.h → libaudiofile/af_UUID.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@
#include <stdint.h>
#include <string>

struct UUID
{
struct af_UUID {
uint8_t data[16];

bool operator==(const UUID &) const;
bool operator!=(const UUID &) const;
bool operator==(const af_UUID &) const;
bool operator!=(const af_UUID &) const;
std::string name() const;
};

Expand Down
4 changes: 2 additions & 2 deletions libaudiofile/alac/ALACBitUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum
};


typedef enum
enum
{

ID_SCE = 0, /* Single Channel Element */
Expand All @@ -65,7 +65,7 @@ typedef enum
ID_PCE = 5,
ID_FIL = 6,
ID_END = 7
} ELEMENT_TYPE;
};

// types
typedef struct BitBuffer
Expand Down
1 change: 1 addition & 0 deletions libaudiofile/modules/BlockCodec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "Track.h"

#include <assert.h>
#include <algorithm>

BlockCodec::BlockCodec(Mode mode, Track *track, File *fh, bool canSeek) :
FileModule(mode, track, fh, canSeek),
Expand Down