diff options
| author | Julien Moutte <julien@moutte.net> | 2006-03-10 22:41:14 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2006-03-10 22:41:14 +0000 |
| commit | ca11b12b62a757a7dd7f068dfa686b9e525e7926 (patch) | |
| tree | ecc2628f0b1fcaef6936678f72e523a65b39330d /gst/modplug | |
| parent | 55e2df515317dbfccb4ada11bbca22edffca4922 (diff) | |
| download | gst-plugins-bad-ca11b12b62a757a7dd7f068dfa686b9e525e7926.tar.gz gst-plugins-bad-ca11b12b62a757a7dd7f068dfa686b9e525e7926.tar.bz2 gst-plugins-bad-ca11b12b62a757a7dd7f068dfa686b9e525e7926.zip | |
gst/modplug/: Fix modplug compilation.
Original commit message from CVS:
2006-03-10 Julien MOUTTE <julien@moutte.net>
* gst/modplug/Makefile.am:
* gst/modplug/gstmodplug.cc: Fix modplug compilation.
Diffstat (limited to 'gst/modplug')
| -rw-r--r-- | gst/modplug/Makefile.am | 5 | ||||
| -rw-r--r-- | gst/modplug/gstmodplug.cc | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 65feb629..8dc78a92 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -3,8 +3,9 @@ SUBDIRS=libmodplug . plugin_LTLIBRARIES = libgstmodplug.la libgstmodplug_la_SOURCES = gstmodplug.cc -libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) +libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la -libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lstdc++ +libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) \ + -lstdc++ noinst_HEADERS = gstmodplug.h diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc index 6c677252..48a62f4f 100644 --- a/gst/modplug/gstmodplug.cc +++ b/gst/modplug/gstmodplug.cc @@ -357,7 +357,7 @@ gst_modplug_src_event (GstPad * pad, GstEvent * event) GstSeekType cur_type, stop_type; gboolean flush; gint64 cur, stop; - gint64 timestamp; + guint64 timestamp; if (modplug->frequency == 0) { GST_DEBUG_OBJECT (modplug, "no song loaded yet"); @@ -389,7 +389,7 @@ gst_modplug_src_event (GstPad * pad, GstEvent * event) cur = CLAMP (cur, 0, modplug->song_length); GST_DEBUG_OBJECT (modplug, "seek to %" GST_TIME_FORMAT, - GST_TIME_ARGS (cur)); + GST_TIME_ARGS ((guint64) cur)); modplug->seek_at = cur; @@ -415,8 +415,9 @@ gst_modplug_src_event (GstPad * pad, GstEvent * event) } GST_LOG_OBJECT (modplug, "sending newsegment from %" GST_TIME_FORMAT "-%" - GST_TIME_FORMAT ", pos=%" GST_TIME_FORMAT, GST_TIME_ARGS (cur), - GST_TIME_ARGS (stop), GST_TIME_ARGS (cur)); + GST_TIME_FORMAT ", pos=%" GST_TIME_FORMAT, + GST_TIME_ARGS ((guint64) cur), GST_TIME_ARGS ((guint64) stop), + GST_TIME_ARGS ((guint64) cur)); gst_pad_push_event (modplug->srcpad, gst_event_new_new_segment (FALSE, rate, @@ -516,7 +517,7 @@ gst_modplug_load_song (GstModPlug * modplug) modplug->seek_at = -1; GST_INFO_OBJECT (modplug, "Song length: %" GST_TIME_FORMAT, - GST_TIME_ARGS (modplug->song_length)); + GST_TIME_ARGS ((guint64) modplug->song_length)); return TRUE; } |