oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

music_pipe: moved struct music_chunk to chunk.h

Browse Source
This commit is contained in:
Max Kellermann
2009-03-03 22:23:25 +01:00
parent 1063c1f2e3
commit c655f804a9
8 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -85,6 +85,7 @@ mpd_headers = \
src/normalize.h \
src/compress.h \
src/pipe.h \
src/chunk.h \
src/path.h \
src/mapper.h \
src/pcm_buffer.h \
@@ -179,6 +180,7 @@ src_mpd_SOURCES = \
src/normalize.c \
src/compress.c \
src/pipe.c \
src/chunk.c \
src/path.c \
src/mapper.c \
src/pcm_convert.c \

34
src/chunk.c Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright (C) 2003-2009 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "chunk.h"
#include "tag.h"
void
music_chunk_init(struct music_chunk *chunk)
{
chunk->length = 0;
chunk->tag = NULL;
}
void
music_chunk_free(struct music_chunk *chunk)
{
if (chunk->tag != NULL)
tag_free(chunk->tag);
}

61
src/chunk.h Normal file
View File

@@ -0,0 +1,61 @@
/*
* Copyright (C) 2003-2009 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef MPD_CHUNK_H
#define MPD_CHUNK_H
#include <stdint.h>
enum {
/* pick 1020 since its devisible for 8,16,24, and 32-bit audio */
CHUNK_SIZE = 1020,
};
/**
* A chunk of music data. Its format is defined by the
* music_pipe_append() caller.
*/
struct music_chunk {
/** number of bytes stored in this chunk */
uint16_t length;
/** current bit rate of the source file */
uint16_t bit_rate;
/** the time stamp within the song */
float times;
/**
* An optional tag associated with this chunk (and the
* following chunks); appears at song boundaries. The tag
* object is owned by this chunk, and must be freed when this
* chunk is deinitialized in music_chunk_free()
*/
struct tag *tag;
/** the data (probably PCM) */
char data[CHUNK_SIZE];
};
void
music_chunk_init(struct music_chunk *chunk);
void
music_chunk_free(struct music_chunk *chunk);
#endif

2
src/crossfade.c
View File

@@ -19,7 +19,7 @@
#include "crossfade.h"
#include "pcm_mix.h"
#include "pipe.h"
#include "chunk.h"
#include "audio_format.h"
#include "tag.h"

1
src/main.c
View File

@@ -32,6 +32,7 @@
#include "path.h"
#include "mapper.h"
#include "pipe.h"
#include "chunk.h"
#include "decoder_control.h"
#include "player_control.h"
#include "stats.h"

15
src/pipe.c
View File

@@ -17,6 +17,7 @@
*/
#include "pipe.h"
#include "chunk.h"
#include "notify.h"
#include "audio_format.h"
#include "tag.h"
@@ -27,20 +28,6 @@
struct music_pipe music_pipe;
static void
music_chunk_init(struct music_chunk *chunk)
{
chunk->length = 0;
chunk->tag = NULL;
}
static void
music_chunk_free(struct music_chunk *chunk)
{
if (chunk->tag != NULL)
tag_free(chunk->tag);
}
void
music_pipe_init(unsigned int size, struct notify *notify)
{

31
src/pipe.h
View File

@@ -23,36 +23,9 @@
#include <stdint.h>
#include <stdbool.h>
/* pick 1020 since its devisible for 8,16,24, and 32-bit audio */
#define CHUNK_SIZE 1020
struct audio_format;
/**
* A chunk of music data. Its format is defined by the
* music_pipe_append() caller.
*/
struct music_chunk {
/** number of bytes stored in this chunk */
uint16_t length;
/** current bit rate of the source file */
uint16_t bit_rate;
/** the time stamp within the song */
float times;
/**
* An optional tag associated with this chunk (and the
* following chunks); appears at song boundaries. The tag
* object is owned by this chunk, and must be freed when this
* chunk is deinitialized in music_chunk_free()
*/
struct tag *tag;
/** the data (probably PCM) */
char data[CHUNK_SIZE];
};
struct tag;
struct music_chunk;
/**
* A ring set of buffers where the decoder appends data after the end,

1
src/player_thread.c
View File

@@ -28,6 +28,7 @@
#include "song.h"
#include "tag.h"
#include "pipe.h"
#include "chunk.h"
#include "idle.h"
#include "main.h"