mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 01:54:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/modplug/: Fix modplug compilation.

Browse source 
Original commit message from CVS:
2006-03-10  Julien MOUTTE  <julien@moutte.net>

* gst/modplug/Makefile.am:
* gst/modplug/gstmodplug.cc: Fix modplug compilation.
This commit is contained in:
Julien Moutte 2006-03-10 22:41:14 +00:00
parent 55e2df5153
commit ca11b12b62
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-03-10 Julien MOUTTE <julien@moutte.net>
* gst/modplug/Makefile.am:
* gst/modplug/gstmodplug.cc: Fix modplug compilation.
2006-03-10 Tim-Philipp Müller <tim at centricular dot net> 2006-03-10 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac: * configure.ac:

5
gst/modplug/Makefile.am
View file

@ -3,8 +3,9 @@ SUBDIRS=libmodplug .
plugin_LTLIBRARIES = libgstmodplug.la plugin_LTLIBRARIES = libgstmodplug.la
libgstmodplug_la_SOURCES = gstmodplug.cc 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_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 noinst_HEADERS = gstmodplug.h

11
gst/modplug/gstmodplug.cc
View file

@ -357,7 +357,7 @@ gst_modplug_src_event (GstPad * pad, GstEvent * event)
GstSeekType cur_type, stop_type; GstSeekType cur_type, stop_type;
gboolean flush; gboolean flush;
gint64 cur, stop; gint64 cur, stop;
gint64 timestamp; guint64 timestamp;
if (modplug->frequency == 0) { if (modplug->frequency == 0) {
GST_DEBUG_OBJECT (modplug, "no song loaded yet"); 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); cur = CLAMP (cur, 0, modplug->song_length);
GST_DEBUG_OBJECT (modplug, "seek to %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (modplug, "seek to %" GST_TIME_FORMAT,
GST_TIME_ARGS (cur)); GST_TIME_ARGS ((guint64) cur));
modplug->seek_at = 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_LOG_OBJECT (modplug, "sending newsegment from %" GST_TIME_FORMAT "-%"
GST_TIME_FORMAT ", pos=%" GST_TIME_FORMAT, GST_TIME_ARGS (cur), GST_TIME_FORMAT ", pos=%" GST_TIME_FORMAT,
GST_TIME_ARGS (stop), GST_TIME_ARGS (cur)); GST_TIME_ARGS ((guint64) cur), GST_TIME_ARGS ((guint64) stop),
GST_TIME_ARGS ((guint64) cur));
gst_pad_push_event (modplug->srcpad, gst_pad_push_event (modplug->srcpad,
gst_event_new_new_segment (FALSE, rate, gst_event_new_new_segment (FALSE, rate,
@ -516,7 +517,7 @@ gst_modplug_load_song (GstModPlug * modplug)
modplug->seek_at = -1; modplug->seek_at = -1;
GST_INFO_OBJECT (modplug, "Song length: %" GST_TIME_FORMAT, GST_INFO_OBJECT (modplug, "Song length: %" GST_TIME_FORMAT,
GST_TIME_ARGS (modplug->song_length)); GST_TIME_ARGS ((guint64) modplug->song_length));
return TRUE; return TRUE;
} }