X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.h;h=1d48174af6cd30635a31522f393285068a580de9;hb=b4caa4470bdb2799ea54978758b677edd9805ee1;hp=9946b0fd626bba7df4968743085477e868f46e9a;hpb=5c633479e3b3b74a2090752543e9633cf36b313a;p=paraslash.git

diff --git a/mp4.h b/mp4.h
index 9946b0fd..1d48174a 100644
--- a/mp4.h
+++ b/mp4.h
@@ -22,22 +22,19 @@ struct mp4; /* opaque */
 void mp4_set_sample_position(struct mp4 *f, int32_t track, int32_t sample);
 int32_t mp4_total_tracks(const struct mp4 *f);
 bool mp4_is_audio_track(const struct mp4 *f, int32_t track);
-struct mp4 *mp4_open_read(struct mp4_callback *f);
+struct mp4 *mp4_open_read(const struct mp4_callback *cb);
 void mp4_close(struct mp4 *f);
 int32_t mp4_get_sample_size(const struct mp4 *f, int track, int sample);
 uint32_t mp4_get_sample_rate(const struct mp4 *f, int32_t track);
 uint32_t mp4_get_channel_count(const struct mp4 * f, int32_t track);
 int32_t mp4_num_samples(const struct mp4 *f, int track);
 uint64_t mp4_get_duration(const struct mp4 *f, int32_t track);
-struct mp4 *mp4_open_meta(struct mp4_callback *f);
+struct mp4 *mp4_open_meta(const struct mp4_callback *cb);
 
-int mp4_meta_get_by_index(const struct mp4 *f, unsigned int index,
-                            char **item, char **value);
-int32_t mp4_meta_update(struct mp4_callback *f,const struct mp4_metadata * data);
-
-int mp4_meta_get_num_items(const struct mp4 *f);
-int mp4_meta_get_artist(const struct mp4 *f, char **value);
-int mp4_meta_get_title(const struct mp4 *f, char **value);
-int mp4_meta_get_date(const struct mp4 *f, char **value);
-int mp4_meta_get_album(const struct mp4 *f, char **value);
-int mp4_meta_get_comment(const struct mp4 *f, char **value);
+struct mp4_metadata *mp4_get_meta(struct mp4 *f);
+int32_t mp4_meta_update(struct mp4 *f);
+char *mp4_meta_get_artist(const struct mp4 *f);
+char *mp4_meta_get_title(const struct mp4 *f);
+char *mp4_meta_get_date(const struct mp4 *f);
+char *mp4_meta_get_album(const struct mp4 *f);
+char *mp4_meta_get_comment(const struct mp4 *f);