fixes #105011 (alpha fixes for printfs and pointer conversion) configure version...

Original commit message from CVS:
fixes #105011 (alpha fixes for printfs and pointer conversion)
configure version update that was still pending

diff --git a/ChangeLog b/ChangeLog
index edf16b17df63f81108bace9869613f871759e9e4..3f9258a69e02c3fbff67bdb23e35639b8eb0e11a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-02  Thomas Vander Stichele <thomas at apestaart dot org>
+
+        * configure.ac:
+          - releasing 0.6.0
+          - update libtool version from 3.0.0 -> 
 2003-01-09  Thomas Vander Stichele <thomas at apestaart dot org>
 
         * first pass at changing _connect/_disconnect -> _link/_unlink

diff --git a/configure.ac b/configure.ac
index bdb0390fbdd5100a57d52acc3890c70b3e743bf1..ad6638986d43c9c8125467c5672ebd45bdcbdb35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CANONICAL_TARGET([])
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gstreamer, GST_VERSION, 0, 5, 2, 2, GST_CVS="no", GST_CVS="yes")
+AS_VERSION(gstreamer, GST_VERSION, 0, 5, 2, 3, GST_CVS="no", GST_CVS="yes")
 
 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
 AM_MAINTAINER_MODE

diff --git a/gst/autoplug/spidertest.c b/gst/autoplug/spidertest.c
index c5c14df5a45f80ce3aee97160b661329a31d36c0..b6dc5970cc25c1e3637b541356d2db03eafc542b 100644 (file)
--- a/gst/autoplug/spidertest.c
+++ b/gst/autoplug/spidertest.c
@@ -45,7 +45,7 @@ property_change_callback (GObject *object, GstObject *orig, GParamSpec *pspec)
     else if (G_IS_PARAM_SPEC_ENUM (pspec))
       str = g_strdup_printf ("%d", g_value_get_enum (&value));
     else if (G_IS_PARAM_SPEC_INT64 (pspec))
-      str = g_strdup_printf ("%lld", g_value_get_int64 (&value));
+      str = g_strdup_printf ("%" G_GINT64_FORMAT, g_value_get_int64 (&value));
     else
       str = g_strdup_value_contents (&value);
       

diff --git a/gst/cothreads.c b/gst/cothreads.c
index 22bddd4545b85a8324a6ca6bfa993203d5f0abbb..17944ab505cdd4f3514b031007cd8df545371921 100644 (file)
--- a/gst/cothreads.c
+++ b/gst/cothreads.c
@@ -597,7 +597,8 @@ cothread_switch (cothread_state *cothread)
            ctx->current, cothread->cothreadnum);
   ctx->current = cothread->cothreadnum;
 
-  g_static_private_set (&_gst_debug_cothread_index, (void *)ctx->current, NULL);
+  g_static_private_set (&_gst_debug_cothread_index,
+                        GINT_TO_POINTER(ctx->current), NULL);
 
   /* save the current stack pointer, frame pointer, and pc */
 #ifdef GST_ARCH_PRESETJMP

diff --git a/gst/elements/gstaggregator.c b/gst/elements/gstaggregator.c
index 77a5e30e29ffb917fe54f287ca0831957f798156..04c7f8aa6d71604570ac831d627cdbc5e4f66230 100644 (file)
--- a/gst/elements/gstaggregator.c
+++ b/gst/elements/gstaggregator.c
@@ -268,7 +268,8 @@ gst_aggregator_push (GstAggregator *aggregator, GstPad *pad, GstBuffer *buf, guc
   if (!aggregator->silent) {
     g_free (aggregator->last_message);
 
-    aggregator->last_message = g_strdup_printf ("%10.10s ******* (%s:%s)a (%d bytes, %llu)",
+    aggregator->last_message = g_strdup_printf ("%10.10s ******* (%s:%s)a (%d bytes, %"
+                                               G_GUINT64_FORMAT ")",
             debug, GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
 
     g_object_notify (G_OBJECT (aggregator), "last_message");

diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c
index 886cd065e35643df8b418de67f112a4f9df374fc..74a879033f182f355d2eed88e3181c6f2e213a4c 100644 (file)
--- a/gst/elements/gstfakesink.c
+++ b/gst/elements/gstfakesink.c
@@ -291,7 +291,8 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf)
   if (!fakesink->silent) { 
     g_free (fakesink->last_message);
 
-    fakesink->last_message = g_strdup_printf ("chain   ******* (%s:%s)< (%d bytes, %lld, %d) %p",
+    fakesink->last_message = g_strdup_printf ("chain   ******* (%s:%s)< (%d bytes, %"
+                                              G_GINT64_FORMAT ", %d) %p",
                GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), 
                GST_BUFFER_FLAGS (buf), buf);
     

diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c
index ccbc9f083078abc94f58aedc0004ab7d0e97b756..ca9eb427588972cce5b9126a8e1907aca569ff25 100644 (file)
--- a/gst/elements/gstfakesrc.c
+++ b/gst/elements/gstfakesrc.c
@@ -763,7 +763,8 @@ gst_fakesrc_get(GstPad *pad)
   if (!src->silent) {
     g_free (src->last_message);
 
-    src->last_message = g_strdup_printf ("get      ******* (%s:%s)> (%d bytes, %llu) %p",
+    src->last_message = g_strdup_printf ("get      ******* (%s:%s)> (%d bytes, %"
+                                         G_GUINT64_FORMAT " ) %p",
                       GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
 
     g_object_notify (G_OBJECT (src), "last_message");

diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index c5f110108736d6ef10cf45f3e66f968906afa017..12fb2bc6dcc239cde06d0193faffa385b9adecd8 100644 (file)
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -367,8 +367,11 @@ gst_filesrc_free_parent_mmap (GstBuffer *buf)
 #endif
   /* now unmap the memory */
   munmap (GST_BUFFER_DATA (buf), GST_BUFFER_MAXSIZE (buf));
-  GST_DEBUG (0, "unmapped region %08llx+%08llx at %p", 
-                 GST_BUFFER_OFFSET (buf), GST_BUFFER_MAXSIZE (buf), 
+  /* cast to unsigned long, since there's no gportable way to print
+   * guint64 as hex */
+  GST_DEBUG (0, "unmapped region %08lx+%08lx at %p", 
+                 (unsigned long) GST_BUFFER_OFFSET (buf),
+                 (unsigned long) GST_BUFFER_MAXSIZE (buf), 
                  GST_BUFFER_DATA (buf));
 
   GST_BUFFER_DATA (buf) = NULL;
@@ -397,8 +400,8 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
             size, src->fd, offset, strerror (errno));
     return NULL;
   }
-  GST_DEBUG (0, "mapped region %08llx+%08x from file into memory at %p", 
-                 offset, size, mmapregion);
+  GST_DEBUG (0, "mapped region %08lx+%08lx from file into memory at %p", 
+                 (unsigned long)offset, (unsigned long)size, mmapregion);
 
   /* time to allocate a new mapbuf */
   buf = gst_buffer_new ();
@@ -514,7 +517,8 @@ gst_filesrc_get (GstPad *pad)
 
   /* check for EOF */
   if (src->curoffset == src->filelen) {
-    GST_DEBUG (0, "filesrc eos %lld %lld", src->curoffset, src->filelen);
+    GST_DEBUG (0, "filesrc eos %" G_GINT64_FORMAT
+                 " %" G_GINT64_FORMAT, src->curoffset, src->filelen);
     gst_element_set_eos (GST_ELEMENT (src));
     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
   }
@@ -531,8 +535,9 @@ gst_filesrc_get (GstPad *pad)
     readend = src->curoffset + readsize;
   }
 
-  GST_DEBUG (0, "attempting to read %08x, %08llx, %08llx, %08llx", 
-                 readsize, readend, mapstart, mapend);
+  GST_DEBUG (0, "attempting to read %08lx, %08lx, %08lx, %08lx", 
+                 (unsigned long)readsize, (unsigned long)readend,
+                 (unsigned long)mapstart, (unsigned long)mapend);
 
   /* if the start is past the mapstart */
   if (src->curoffset >= mapstart) {
@@ -787,19 +792,19 @@ gst_filesrc_srcpad_event (GstPad *pad, GstEvent *event)
           if (offset > src->filelen) 
            goto error;
           src->curoffset = offset;
-          GST_DEBUG(0, "seek set pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek set pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
         case GST_SEEK_METHOD_CUR:
           if (offset + src->curoffset > src->filelen) 
            goto error;
           src->curoffset += offset;
-          GST_DEBUG(0, "seek cur pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek cur pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
         case GST_SEEK_METHOD_END:
           if (ABS (offset) > src->filelen) 
            goto error;
           src->curoffset = src->filelen - ABS (offset);
-          GST_DEBUG(0, "seek end pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek end pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
        default:
           goto error;

diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c
index 4e2ae33efd917cb9170a2bb2df9552597e92c080..75d4b0da465b5cbca36b97438535aa86a876b4f7 100644 (file)
--- a/gst/elements/gstidentity.c
+++ b/gst/elements/gstidentity.c
@@ -220,7 +220,8 @@ gst_identity_chain (GstPad *pad, GstBuffer *buf)
       if (identity->last_message != NULL) {
        g_free (identity->last_message);
       }
-      identity->last_message = g_strdup_printf ("dropping   ******* (%s:%s)i (%d bytes, %llu)",
+      identity->last_message = g_strdup_printf ("dropping   ******* (%s:%s)i (%d bytes, %"
+                                                G_GINT64_FORMAT ")",
              GST_DEBUG_PAD_NAME (identity->sinkpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
       g_object_notify (G_OBJECT (identity), "last-message");
       gst_buffer_unref (buf);
@@ -234,7 +235,8 @@ gst_identity_chain (GstPad *pad, GstBuffer *buf)
   for (i = identity->duplicate; i; i--) {
     if (!identity->silent) {
       g_free (identity->last_message);
-      identity->last_message = g_strdup_printf ("chain   ******* (%s:%s)i (%d bytes, %llu)",
+      identity->last_message = g_strdup_printf ("chain   ******* (%s:%s)i (%d bytes, %"
+                                                G_GINT64_FORMAT ")",
              GST_DEBUG_PAD_NAME (identity->sinkpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
       g_object_notify (G_OBJECT (identity), "last-message");
     }

diff --git a/gst/elements/gststatistics.c b/gst/elements/gststatistics.c
index 9426f042288c12c499031dd9224cf63c1a1b7326..57dbebf1e7aca789e808b0302c6c19a842cd4d31 100644 (file)
--- a/gst/elements/gststatistics.c
+++ b/gst/elements/gststatistics.c
@@ -208,7 +208,9 @@ print_stats(gboolean first, const gchar *name, const gchar *type, stats *base, s
   delta.bytes = final->bytes - base->bytes;
   delta.events = final->events - base->events;
 
-  g_print("%s: (%s) %s: s:%g buffers:%lld bytes:%lld events:%lld\n",
+  g_print("%s: (%s) %s: s:%g buffers:%" G_GINT64_FORMAT 
+         " bytes:%" G_GINT64_FORMAT
+         " events:%" G_GINT64_FORMAT "\n",
     first ? header0 : headerN,
     name, type, time,
     final->buffers,

diff --git a/gst/elements/gsttee.c b/gst/elements/gsttee.c
index a54022fc6a797f31189b69f73bfc2b922d0650c5..34b23193a4df338ea61531ed0b8bca109569446d 100644 (file)
--- a/gst/elements/gsttee.c
+++ b/gst/elements/gsttee.c
@@ -301,7 +301,8 @@ gst_tee_chain (GstPad *pad, GstBuffer *buf)
 
     if (!tee->silent) {
       g_free (tee->last_message);
-      tee->last_message = g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %llu) %p",
+      tee->last_message = g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %"
+                                          G_GUINT64_FORMAT ") %p",
               GST_DEBUG_PAD_NAME (outpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
       g_object_notify (G_OBJECT (tee), "last_message");
     }

diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index b93edcd2b54e177350499542d818febf859d803b..07a26d139fb90b3b8b53f171c246fd1b1f1a1b77 100644 (file)
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -195,7 +195,7 @@ gst_default_debug_handler (gint category, gboolean incore,
   gchar *empty = "";
   gchar *elementname = empty,*location = empty;
   int pid = getpid();
-  int cothread_id = (int) g_static_private_get(&_gst_debug_cothread_index);
+  int cothread_id = GPOINTER_TO_INT(g_static_private_get(&_gst_debug_cothread_index));
 #ifdef GST_DEBUG_COLOR
   int pid_color = pid%6 + 31;
   int cothread_color = (cothread_id < 0) ? 37 : (cothread_id%6 + 31);
@@ -307,7 +307,7 @@ gst_default_info_handler (gint category, gboolean incore,
   gchar *empty = "";
   gchar *elementname = empty,*location = empty;
   int pid = getpid();
-  int cothread_id = (int) g_static_private_get(&_gst_debug_cothread_index);
+  int cothread_id = GPOINTER_TO_INT(g_static_private_get(&_gst_debug_cothread_index));
 #ifdef GST_DEBUG_COLOR
   int pid_color = pid%6 + 31;
   int cothread_color = (cothread_id < 0) ? 37 : (cothread_id%6 + 31);

diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c
index 42dd6b36de8bcdfe5d127c5591b1658235d7d1ea..b90634f9bbdd2ca9afd2cbf1fd35bf0575572cb6 100644 (file)
--- a/gst/gstsystemclock.c
+++ b/gst/gstsystemclock.c
@@ -143,7 +143,8 @@ gst_system_clock_wait (GstClock *clock, GstClockEntry *entry)
   diff = GST_CLOCK_ENTRY_TIME (entry) - current;
 
   if (ABS (diff) > clock->max_diff) {
-    g_warning ("abnormal clock request diff: ABS(%lld) > %lld", diff, clock->max_diff);
+    g_warning ("abnormal clock request diff: ABS(%" G_GINT64_FORMAT
+               ") > %" G_GINT64_FORMAT, diff, clock->max_diff);
     return GST_CLOCK_ENTRY_EARLY;
   }
   

diff --git a/gst/gsttrace.c b/gst/gsttrace.c
index dfa2454fe62ff470d38e8a77bafa77b47b66e5b4..f0fac78bf7fe6495ad2da6073e747f59ff4a4033 100644 (file)
--- a/gst/gsttrace.c
+++ b/gst/gsttrace.c
@@ -118,7 +118,7 @@ gst_trace_text_flush (GstTrace * trace)
   }
 
   for (i = 0; i < trace->bufoffset; i++) {
-    snprintf (str, strsize, "%20lld %10d %10d %s\n",
+    snprintf (str, strsize, "%20" G_GINT64_FORMAT " %10d %10d %s\n",
              trace->buf[i].timestamp,
              trace->buf[i].sequence, trace->buf[i].data, trace->buf[i].message);
     write (trace->fd, str, strlen (str));

diff --git a/libs/gst/control/dparam.c b/libs/gst/control/dparam.c
index 9a73f4f43e86f85b1cb4c91188ecb502478a7236..dd21f5cb8d6fee85d6d06f371c42fb8057aeca72 100644 (file)
--- a/libs/gst/control/dparam.c
+++ b/libs/gst/control/dparam.c
@@ -184,7 +184,10 @@ gst_dparam_set_property (GObject *object, guint prop_id, const GValue *value, GP
                        break;
                        
                case ARG_VALUE_INT64:
-                       GST_DEBUG(GST_CAT_PARAMS, "setting value from %lld to %lld", dparam->value_int64, g_value_get_int64 (value));
+                       GST_DEBUG(GST_CAT_PARAMS, "setting value from %"
+                                                 G_GINT64_FORMAT " to %"
+                                                 G_GINT64_FORMAT,
+                                 dparam->value_int64, g_value_get_int64 (value));
                        dparam->value_int64 = g_value_get_int (value);
                        GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam);
                        GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;

diff --git a/libs/gst/control/dparam_smooth.c b/libs/gst/control/dparam_smooth.c
index 2e0607819b49e404003b373c3cc0573fa6a24a89..747d0fb6ac5c169d0f537a1cd46767139623eae5 100644 (file)
--- a/libs/gst/control/dparam_smooth.c
+++ b/libs/gst/control/dparam_smooth.c
@@ -157,7 +157,9 @@ gst_dpsmooth_set_property (GObject *object, guint prop_id, const GValue *value,
 
                case ARG_SLOPE_TIME:
                        dpsmooth->slope_time = g_value_get_int64 (value);
-                       GST_DEBUG(GST_CAT_PARAMS, "dpsmooth->slope_time:%lld",dpsmooth->slope_time);
+                       GST_DEBUG(GST_CAT_PARAMS, "dpsmooth->slope_time:%"
+                                                 G_GINT64_FORMAT,
+                                 dpsmooth->slope_time);
                        GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;
                        break;
 
@@ -219,7 +221,8 @@ gst_dpsmooth_value_changed_float (GstDParam *dparam)
 
        dpsmooth->need_interp_times = TRUE;
 
-       GST_DEBUG(GST_CAT_PARAMS, "%f to %f ratio:%f duration:%lld\n", 
+       GST_DEBUG(GST_CAT_PARAMS, "%f to %f ratio:%f duration:%"
+                                 G_GINT64_FORMAT "\n", 
                  dpsmooth->start_float, dparam->value_float, time_ratio, dpsmooth->duration_interp);
 }
 
@@ -246,7 +249,8 @@ gst_dpsmooth_do_update_float (GstDParam *dparam, gint64 timestamp, GValue *value
                }
                dpsmooth->current_float = dparam->value_float;
                
-               GST_DEBUG(GST_CAT_PARAMS, "interp finished at %lld", timestamp); 
+               GST_DEBUG(GST_CAT_PARAMS, "interp finished at %"
+                                         G_GINT64_FORMAT, timestamp); 
 
                GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam) = timestamp;  
                GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = timestamp;
@@ -266,7 +270,7 @@ gst_dpsmooth_do_update_float (GstDParam *dparam, gint64 timestamp, GValue *value
                GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam) = timestamp;  
                GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = dpsmooth->start_interp + dpsmooth->update_period; 
                
-               GST_DEBUG(GST_CAT_PARAMS, "interp started at %lld", timestamp); 
+               GST_DEBUG(GST_CAT_PARAMS, "interp started at %" G_GINT64_FORMAT, timestamp); 
 
                GST_DPARAM_UNLOCK(dparam);
                return;
@@ -275,7 +279,7 @@ gst_dpsmooth_do_update_float (GstDParam *dparam, gint64 timestamp, GValue *value
 
        time_ratio = (gfloat)(timestamp - dpsmooth->start_interp) / (gfloat)dpsmooth->duration_interp;
 
-       GST_DEBUG(GST_CAT_PARAMS, "start:%lld current:%lld end:%lld ratio%f", dpsmooth->start_interp, timestamp, dpsmooth->end_interp, time_ratio); 
+       GST_DEBUG(GST_CAT_PARAMS, "start:%" G_GINT64_FORMAT " current:%" G_GINT64_FORMAT " end:%" G_GINT64_FORMAT " ratio%f", dpsmooth->start_interp, timestamp, dpsmooth->end_interp, time_ratio); 
        GST_DEBUG(GST_CAT_PARAMS, "pre  start:%f current:%f target:%f", dpsmooth->start_float, dpsmooth->current_float, dparam->value_float);
                                   
        dpsmooth->current_float = dpsmooth->start_float + (dpsmooth->diff_float * time_ratio);

diff --git a/libs/gst/control/dparammanager.c b/libs/gst/control/dparammanager.c
index fdb26c836b4f0b55723228071faba4b7e4d902d5..522919aa9fd4241255c4ad3ac7ddc9da6ba9794d 100644 (file)
--- a/libs/gst/control/dparammanager.c
+++ b/libs/gst/control/dparammanager.c
@@ -810,7 +810,10 @@ gst_dpman_preprocess_asynchronous(GstDParamManager *dpman, guint frames, gint64
                        dpwrap->next_update_frame = (guint)(current_time - timestamp) / dpman->rate_ratio;
                        updates_pending = TRUE;
 
-                       GST_DEBUG(GST_CAT_PARAMS, "timestamp start: %lld end: %lld current: %lld", 
+                       GST_DEBUG(GST_CAT_PARAMS, "timestamp start: %"
+                                 G_GINT64_FORMAT " end: %"
+                                 G_GINT64_FORMAT " current: %"
+                                 G_GINT64_FORMAT, 
                                  timestamp, dpman->time_buffer_ends, current_time);
 
                }

diff --git a/plugins/elements/gstaggregator.c b/plugins/elements/gstaggregator.c
index 77a5e30e29ffb917fe54f287ca0831957f798156..04c7f8aa6d71604570ac831d627cdbc5e4f66230 100644 (file)
--- a/plugins/elements/gstaggregator.c
+++ b/plugins/elements/gstaggregator.c
@@ -268,7 +268,8 @@ gst_aggregator_push (GstAggregator *aggregator, GstPad *pad, GstBuffer *buf, guc
   if (!aggregator->silent) {
     g_free (aggregator->last_message);
 
-    aggregator->last_message = g_strdup_printf ("%10.10s ******* (%s:%s)a (%d bytes, %llu)",
+    aggregator->last_message = g_strdup_printf ("%10.10s ******* (%s:%s)a (%d bytes, %"
+                                               G_GUINT64_FORMAT ")",
             debug, GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
 
     g_object_notify (G_OBJECT (aggregator), "last_message");

diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c
index 886cd065e35643df8b418de67f112a4f9df374fc..74a879033f182f355d2eed88e3181c6f2e213a4c 100644 (file)
--- a/plugins/elements/gstfakesink.c
+++ b/plugins/elements/gstfakesink.c
@@ -291,7 +291,8 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf)
   if (!fakesink->silent) { 
     g_free (fakesink->last_message);
 
-    fakesink->last_message = g_strdup_printf ("chain   ******* (%s:%s)< (%d bytes, %lld, %d) %p",
+    fakesink->last_message = g_strdup_printf ("chain   ******* (%s:%s)< (%d bytes, %"
+                                              G_GINT64_FORMAT ", %d) %p",
                GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), 
                GST_BUFFER_FLAGS (buf), buf);
     

diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c
index ccbc9f083078abc94f58aedc0004ab7d0e97b756..ca9eb427588972cce5b9126a8e1907aca569ff25 100644 (file)
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -763,7 +763,8 @@ gst_fakesrc_get(GstPad *pad)
   if (!src->silent) {
     g_free (src->last_message);
 
-    src->last_message = g_strdup_printf ("get      ******* (%s:%s)> (%d bytes, %llu) %p",
+    src->last_message = g_strdup_printf ("get      ******* (%s:%s)> (%d bytes, %"
+                                         G_GUINT64_FORMAT " ) %p",
                       GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
 
     g_object_notify (G_OBJECT (src), "last_message");

diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index c5f110108736d6ef10cf45f3e66f968906afa017..12fb2bc6dcc239cde06d0193faffa385b9adecd8 100644 (file)
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -367,8 +367,11 @@ gst_filesrc_free_parent_mmap (GstBuffer *buf)
 #endif
   /* now unmap the memory */
   munmap (GST_BUFFER_DATA (buf), GST_BUFFER_MAXSIZE (buf));
-  GST_DEBUG (0, "unmapped region %08llx+%08llx at %p", 
-                 GST_BUFFER_OFFSET (buf), GST_BUFFER_MAXSIZE (buf), 
+  /* cast to unsigned long, since there's no gportable way to print
+   * guint64 as hex */
+  GST_DEBUG (0, "unmapped region %08lx+%08lx at %p", 
+                 (unsigned long) GST_BUFFER_OFFSET (buf),
+                 (unsigned long) GST_BUFFER_MAXSIZE (buf), 
                  GST_BUFFER_DATA (buf));
 
   GST_BUFFER_DATA (buf) = NULL;
@@ -397,8 +400,8 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
             size, src->fd, offset, strerror (errno));
     return NULL;
   }
-  GST_DEBUG (0, "mapped region %08llx+%08x from file into memory at %p", 
-                 offset, size, mmapregion);
+  GST_DEBUG (0, "mapped region %08lx+%08lx from file into memory at %p", 
+                 (unsigned long)offset, (unsigned long)size, mmapregion);
 
   /* time to allocate a new mapbuf */
   buf = gst_buffer_new ();
@@ -514,7 +517,8 @@ gst_filesrc_get (GstPad *pad)
 
   /* check for EOF */
   if (src->curoffset == src->filelen) {
-    GST_DEBUG (0, "filesrc eos %lld %lld", src->curoffset, src->filelen);
+    GST_DEBUG (0, "filesrc eos %" G_GINT64_FORMAT
+                 " %" G_GINT64_FORMAT, src->curoffset, src->filelen);
     gst_element_set_eos (GST_ELEMENT (src));
     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
   }
@@ -531,8 +535,9 @@ gst_filesrc_get (GstPad *pad)
     readend = src->curoffset + readsize;
   }
 
-  GST_DEBUG (0, "attempting to read %08x, %08llx, %08llx, %08llx", 
-                 readsize, readend, mapstart, mapend);
+  GST_DEBUG (0, "attempting to read %08lx, %08lx, %08lx, %08lx", 
+                 (unsigned long)readsize, (unsigned long)readend,
+                 (unsigned long)mapstart, (unsigned long)mapend);
 
   /* if the start is past the mapstart */
   if (src->curoffset >= mapstart) {
@@ -787,19 +792,19 @@ gst_filesrc_srcpad_event (GstPad *pad, GstEvent *event)
           if (offset > src->filelen) 
            goto error;
           src->curoffset = offset;
-          GST_DEBUG(0, "seek set pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek set pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
         case GST_SEEK_METHOD_CUR:
           if (offset + src->curoffset > src->filelen) 
            goto error;
           src->curoffset += offset;
-          GST_DEBUG(0, "seek cur pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek cur pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
         case GST_SEEK_METHOD_END:
           if (ABS (offset) > src->filelen) 
            goto error;
           src->curoffset = src->filelen - ABS (offset);
-          GST_DEBUG(0, "seek end pending to %lld", src->curoffset);
+          GST_DEBUG(0, "seek end pending to %" G_GINT64_FORMAT, src->curoffset);
          break;
        default:
           goto error;

diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c
index 4e2ae33efd917cb9170a2bb2df9552597e92c080..75d4b0da465b5cbca36b97438535aa86a876b4f7 100644 (file)
--- a/plugins/elements/gstidentity.c
+++ b/plugins/elements/gstidentity.c
@@ -220,7 +220,8 @@ gst_identity_chain (GstPad *pad, GstBuffer *buf)
       if (identity->last_message != NULL) {
        g_free (identity->last_message);
       }
-      identity->last_message = g_strdup_printf ("dropping   ******* (%s:%s)i (%d bytes, %llu)",
+      identity->last_message = g_strdup_printf ("dropping   ******* (%s:%s)i (%d bytes, %"
+                                                G_GINT64_FORMAT ")",
              GST_DEBUG_PAD_NAME (identity->sinkpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
       g_object_notify (G_OBJECT (identity), "last-message");
       gst_buffer_unref (buf);
@@ -234,7 +235,8 @@ gst_identity_chain (GstPad *pad, GstBuffer *buf)
   for (i = identity->duplicate; i; i--) {
     if (!identity->silent) {
       g_free (identity->last_message);
-      identity->last_message = g_strdup_printf ("chain   ******* (%s:%s)i (%d bytes, %llu)",
+      identity->last_message = g_strdup_printf ("chain   ******* (%s:%s)i (%d bytes, %"
+                                                G_GINT64_FORMAT ")",
              GST_DEBUG_PAD_NAME (identity->sinkpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
       g_object_notify (G_OBJECT (identity), "last-message");
     }

diff --git a/plugins/elements/gststatistics.c b/plugins/elements/gststatistics.c
index 9426f042288c12c499031dd9224cf63c1a1b7326..57dbebf1e7aca789e808b0302c6c19a842cd4d31 100644 (file)
--- a/plugins/elements/gststatistics.c
+++ b/plugins/elements/gststatistics.c
@@ -208,7 +208,9 @@ print_stats(gboolean first, const gchar *name, const gchar *type, stats *base, s
   delta.bytes = final->bytes - base->bytes;
   delta.events = final->events - base->events;
 
-  g_print("%s: (%s) %s: s:%g buffers:%lld bytes:%lld events:%lld\n",
+  g_print("%s: (%s) %s: s:%g buffers:%" G_GINT64_FORMAT 
+         " bytes:%" G_GINT64_FORMAT
+         " events:%" G_GINT64_FORMAT "\n",
     first ? header0 : headerN,
     name, type, time,
     final->buffers,

diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c
index a54022fc6a797f31189b69f73bfc2b922d0650c5..34b23193a4df338ea61531ed0b8bca109569446d 100644 (file)
--- a/plugins/elements/gsttee.c
+++ b/plugins/elements/gsttee.c
@@ -301,7 +301,8 @@ gst_tee_chain (GstPad *pad, GstBuffer *buf)
 
     if (!tee->silent) {
       g_free (tee->last_message);
-      tee->last_message = g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %llu) %p",
+      tee->last_message = g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %"
+                                          G_GUINT64_FORMAT ") %p",
               GST_DEBUG_PAD_NAME (outpad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
       g_object_notify (G_OBJECT (tee), "last_message");
     }

diff --git a/tests/lat.c b/tests/lat.c
index 12ce41a9f15fa81b610a9a88f188f83f5a4f0e2a..0f7733898e076558f52ee623050a04601544fde8 100644 (file)
--- a/tests/lat.c
+++ b/tests/lat.c
@@ -28,7 +28,7 @@ void handoff_sink(GstElement *sink, GstBuffer *buf, gpointer user_data) {
   avg_ns = (guint)(1000.0*(double)avg/(double)mhz);
   
   if ((count % print_del) == 0) {
-    g_print("%07d:%08lld min:%08lld max:%08lld avg:%08lld avg-s:0.%09d\r",
+    g_print("%07d:%08" G_GUINT64_FORMAT " min:%08" G_GUINT64_FORMAT " max:%08" G_GUINT64_FORMAT " avg:%08" G_GUINT64_FORMAT " avg-s:0.%09d\r",
         count, d, min, max, avg, avg_ns);
   }
 }

diff --git a/tests/memchunk/gmemchunktest.c b/tests/memchunk/gmemchunktest.c
index 074fc2446d7ee92a7b1b4b1dc92f8a32e4b06dea..8dadc54e05473763eb503387101e8a3aa1a83d55 100644 (file)
--- a/tests/memchunk/gmemchunktest.c
+++ b/tests/memchunk/gmemchunktest.c
@@ -68,7 +68,7 @@ main (gint argc, gchar *argv[])
 
   for(t=0; t < num_threads; t++) {
     error = NULL;
-    threads[t] = g_thread_create (run_test, (void *)t, TRUE, &error);
+    threads[t] = g_thread_create (run_test, GINT_TO_POINTER(t), TRUE, &error);
     if (error) {
       printf ("ERROR: g_thread_create () is %s\n", error->message);
       exit (-1);

diff --git a/tests/memchunk/gstmemchunktest.c b/tests/memchunk/gstmemchunktest.c
index cade77abadeca498d72d4dd67afcf84ef726398c..853c537414bf9380a96173e8dae28c5012b38792 100644 (file)
--- a/tests/memchunk/gstmemchunktest.c
+++ b/tests/memchunk/gstmemchunktest.c
@@ -63,7 +63,7 @@ main (gint argc, gchar *argv[])
 
   for(t=0; t < num_threads; t++) {
     error = NULL;
-    threads[t] = g_thread_create (run_test, (void *)t, TRUE, &error);
+    threads[t] = g_thread_create (run_test, GINT_TO_POINTER(t), TRUE, &error);
     if (error) {
       printf ("ERROR: g_thread_create() %s\n", error->message);
       exit (-1);

diff --git a/tests/muxing/case1.c b/tests/muxing/case1.c
index 33149cafb6a1b7f888234acc3373755bd419ba1a..f9e9a828a1f7928bbc6229ee45ffb092e54e012b 100644 (file)
--- a/tests/muxing/case1.c
+++ b/tests/muxing/case1.c
@@ -5,7 +5,7 @@ gboolean playing = TRUE;
 static void
 handoff_signal (GstElement *element, GstBuffer *buf)
 {
-  g_print ("handoff \"%s\" %llu\n", gst_element_get_name (element), GST_BUFFER_TIMESTAMP (buf));
+  g_print ("handoff \"%s\" %" G_GINT64_FORMAT "\n", gst_element_get_name (element), GST_BUFFER_TIMESTAMP (buf));
 }
 
 static void

diff --git a/tests/seeking/seeking1.c b/tests/seeking/seeking1.c
index 20bac0bf15ed9652cfb3d074621c28a3498b5756..af20fbf416e77209c20b8ac3952a9ff0a875f43c 100644 (file)
--- a/tests/seeking/seeking1.c
+++ b/tests/seeking/seeking1.c
@@ -60,9 +60,9 @@ main (gint argc, gchar *argv[])
   format = GST_FORMAT_DEFAULT;
 
   gst_pad_query (pad, GST_QUERY_START, &format, &value);
-  g_print ("configured for start   %lld\n", value);
+  g_print ("configured for start   %" G_GINT64_FORMAT "\n", value);
   gst_pad_query (pad, GST_QUERY_SEGMENT_END, &format, &value);
-  g_print ("configured segment end %lld\n", value);
+  g_print ("configured segment end %" G_GINT64_FORMAT "\n", value);
 
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
@@ -83,9 +83,9 @@ main (gint argc, gchar *argv[])
   g_signal_connect (G_OBJECT (gst_element_get_pad (fakesink, "sink")), "event_received", G_CALLBACK (event_received), event);
 
   gst_pad_query (pad, GST_QUERY_START, &format, &value);
-  g_print ("configured for start   %lld\n", value);
+  g_print ("configured for start   %" G_GINT64_FORMAT "\n", value);
   gst_pad_query (pad, GST_QUERY_SEGMENT_END, &format, &value);
-  g_print ("configured segment end %lld\n", value);
+  g_print ("configured segment end %" G_GINT64_FORMAT "\n", value);
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 

diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 24803189d40fe36d31e09570f9ecf14bbaeaf4df..89990f274c176fd2ba1f76f526187d6358f4d69e 100644 (file)
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -311,7 +311,7 @@ print_element_properties (GstElement *element)
       {
        GParamSpecUInt64 *puint64 = G_PARAM_SPEC_UINT64 (param);
        g_print("%-23.23s Unsigned Integer64. ", ""); 
-       if (readable) g_print("Range: %llu - %llu (Default %llu)", 
+       if (readable) g_print("Range: %" G_GUINT64_FORMAT " - %" G_GUINT64_FORMAT " (Default %" G_GUINT64_FORMAT ")", 
                        puint64->minimum, puint64->maximum, g_value_get_uint64 (&value));
        break;
       }
@@ -319,7 +319,7 @@ print_element_properties (GstElement *element)
       {
        GParamSpecInt64 *pint64 = G_PARAM_SPEC_INT64 (param);
        g_print("%-23.23s Integer64. ", ""); 
-       if (readable) g_print("Range: %lld - %lld (Default %lld)", 
+       if (readable) g_print("Range: %" G_GINT64_FORMAT " - %" G_GINT64_FORMAT " (Default %" G_GINT64_FORMAT ")", 
                        pint64->minimum, pint64->maximum, g_value_get_int64 (&value));
        break;
       }
@@ -680,7 +680,7 @@ print_element_info (GstElementFactory *factory)
 
         switch (G_PARAM_SPEC_VALUE_TYPE (specs[x])) {
           case G_TYPE_INT64: 
-            g_print ("64 Bit Integer (Default %lld, Range %lld -> %lld)", 
+            g_print ("64 Bit Integer (Default %" G_GINT64_FORMAT ", Range %" G_GINT64_FORMAT " -> %" G_GINT64_FORMAT ")", 
             ((GParamSpecInt64 *) specs[x])->default_value,
             ((GParamSpecInt64 *) specs[x])->minimum, 
             ((GParamSpecInt64 *) specs[x])->maximum);

diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index 833d0a875e07964063ed485c51a1ac15f4aa6125..9649a8fb7e97278cc62d2a0fa488263bd4c79c27 100644 (file)
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -19,7 +19,7 @@ idle_func (gpointer data)
 
   /*
   if (s_clock) {
-    g_print ("%lld\n", gst_clock_get_time (s_clock));
+    g_print ("%" G_GINT64_FORMAT "\n", gst_clock_get_time (s_clock));
   }
   */
 
@@ -37,7 +37,7 @@ idle_func (gpointer data)
 
   if (!busy) {
     gst_main_quit ();
-    g_print ("execution ended after %llu iterations (sum %llu ns, average %llu ns, min %llu ns, max %llu ns)\n", 
+    g_print ("execution ended after %" G_GUINT64_FORMAT " iterations (sum %" G_GUINT64_FORMAT " ns, average %" G_GUINT64_FORMAT " ns, min %" G_GUINT64_FORMAT " ns, max %" G_GUINT64_FORMAT " ns)\n", 
                    iterations, sum, sum/iterations, min, max);
   }