mp4: Simplify sample_range_size().

[paraslash.git] / mp4.h

diff --git a/mp4.h b/mp4.h
index 71fd65d9459b18ea4f9b74da8ea8036c82435fa2..0bf7481805242a79f757b1de66a88f122b3481ba 100644 (file)
--- a/mp4.h
+++ b/mp4.h
@@ -1,5 +1,5 @@
 struct mp4_callback {
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
+    ssize_t (*read)(void *user_data, void *buffer, size_t length);
     uint32_t (*write)(void *udata, void *buffer, uint32_t length);
     uint32_t (*seek)(void *user_data, uint64_t position);
     uint32_t (*truncate)(void *user_data);
@@ -20,7 +20,7 @@ struct mp4_metadata {
 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);
+int32_t mp4_get_total_tracks(const struct mp4 *f);
 bool mp4_is_audio_track(const struct mp4 *f, int32_t track);
 struct mp4 *mp4_open_read(const struct mp4_callback *cb);
 void mp4_close(struct mp4 *f);
@@ -31,10 +31,8 @@ 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(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 *f, struct mp4_metadata *meta);
-int mp4_meta_get_num_items(const struct mp4 *f);
+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);