Merge branch 'mk/cleanups'

* mk/cleanups: (60 commits)
  pass constant pointers
  const pointers
  unsigned integers and size_t
  oggflac: fix GCC warnings
  include cleanup
  protect locate.h from double inclusion
  playlist: eliminate unused fd parameters
  jack: made "sample_size" static const
  moved jack configuration to the JackData struct
  jack: removed unused macros
  jack: don't set audioOutput->data=NULL
  jack: initialize JackData in jack_initDriver()
  jack: added freeJackClient()
  jack: initialize jd->client after !jd check
  jack: eliminate superfluous freeJackData() calls
  mp3: converted the MUTEFRAME_ macros to an enum
  mp3: converted the DECODE_ constants to an enum
  wavpack: don't use "isp" before initialization
  wavpack: moved code to wavpack_open_wvc()
  simplified code in the ogg decoder plugin
  ...

1 files changed, 40 insertions, 0 deletions

diff --git a/src/audio_format.h b/src/audio_format.h
new file mode 100644
index 000000000..a6e97e046
--- /dev/null
+++ b/src/audio_format.h
@@ -0,0 +1,40 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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 AUDIO_FORMAT_H
+#define AUDIO_FORMAT_H
+
+#include "mpd_types.h"
+
+typedef struct _AudioFormat {
+	volatile mpd_sint8 channels;
+	volatile mpd_uint32 sampleRate;
+	volatile mpd_sint8 bits;
+} AudioFormat;
+
+static inline double audio_format_time_to_size(const AudioFormat * af)
+{
+	return af->sampleRate * af->bits * af->channels / 8.0;
+}
+
+static inline double audioFormatSizeToTime(const AudioFormat * af)
+{
+	return 8.0 / af->bits / af->channels / af->sampleRate;
+}
+
+#endif