Changeset 6da08521b20cf48028bfdef07438577f7cf11272

Timestamp:

02/12/03 02:54:30 (5 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1070330070 +0000

git-parent:

[59173c65552ee499e502e4961215e85526e483ff]

git-author:

Rocky Bernstein <rocky@videolan.org> 1070330070 +0000

Message:

Add secstotimestr and msecstotimestr to convert (milli)seconds to a
time string.

Files:

• include/mtime.h (modified) (3 diffs)
• modules/access/cdda/access.c (modified) (5 diffs)
• modules/demux/mkv.cpp (modified) (2 diffs)
• modules/gui/gtk/playlist.c (modified) (2 diffs)
• src/misc/mtime.c (modified) (3 diffs)

include/mtime.h

@@ -10 +10 @@
- *****************************************************************************
- * Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN
-3 2002/11/11 14:39:11 sam
+4 2003/12/02 01:54:30 rocky
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -48 +48 @@
-#define MSTRTIME_MAX_SIZE 22
-
+#define msecstotimestr(psz_buffer, msecs) \
+  secstotimestr( psz_buffer, (msecs / (int) 1000) )
+
-/*****************************************************************************
- * Prototypes
@@ -55 +58 @@
-VLC_EXPORT( void,    mwait,    ( mtime_t date ) );
-VLC_EXPORT( void,    msleep,   ( mtime_t delay ) );
+VLC_EXPORT( char *,  secstotimestr, ( char *psz_buffer, int secs ) );
-

modules/access/cdda/access.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
-7 2003/12/01 03:3
+8 2003/12/02 01:5
- *
- * Authors: Rocky Bernstein <rocky@panix.com> 
@@ -519 +519 @@
-}
-
-static 
-char * secs2TimeStr( int64_t i_sec )
-{
-  int h = i_sec / 3600;
-  int m = ( i_sec / 60 ) % 60;
-  int s = i_sec % 60;
-  static char buffer[20];
-
-  snprintf(buffer, 20, "%d:%2.2d:%2.2d", h, m, s);
-  return buffer;
-}
-
-#define meta_info_add_str(title, str) \
-  if ( str ) {                      \
@@ -552 +540 @@
-      {
-    int64_t i_sec = (int64_t) p_cdda->cddb.disc->length;
-
+
+
+
-      } else 
-      {
@@ -586 +576 @@
-  {
-    track_t i_track = p_cdda->i_nb_tracks;
+    char psz_buffer[MSTRTIME_MAX_SIZE];
-    mtime_t i_duration = 
-      (p_cdda->p_sectors[i_track] - p_cdda->p_sectors[i_track-1]) 
-      / CDIO_CD_FRAMES_PER_SEC;
-
-
+
+
-  }
-}
@@ -830 +822 @@
-    case 's':
-      if (p_cdda->i_cddb_enabled) {
+    char psz_buffer[MSTRTIME_MAX_SIZE];
-    mtime_t i_duration = 
-      (p_cdda->p_sectors[i_track] - p_cdda->p_sectors[i_track-1]) 
-      / CDIO_CD_FRAMES_PER_SEC;
-2TimeStr(i_duration)
+totimestr( psz_buffer, i_duration ) 
-      } else goto not_special;
-      break;

modules/demux/mkv.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2003/11/28 22:23:04 fenrir
+8 2003/12/02 01:54:30 rocky
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -2172 +2172 @@
-    if( p_sys->f_duration > 1000.1 )
-    {
-
-
-
-
-
-
-
-
+
+
+
-    }
-

modules/gui/gtk/playlist.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2003/11/30 19:42:52 sigmunau
+6 2003/12/02 01:54:30 rocky
- *
- * Authors: Pierre Baillet <oct@zoy.org>
@@ -695 +695 @@
-    for( i_dummy = p_playlist->i_size ; i_dummy-- ; )
-    {
-14
+MSTRTIME_MAX_SIZE
-        mtime_t dur = p_playlist->pp_items[i_dummy]->i_duration;
-        if ( dur != -1 )
-        {
-
-
+
-        }
-        else

src/misc/mtime.c

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-6 2003/06/05 11:52:19 gbazin
+7 2003/12/02 01:54:30 rocky
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -68 +68 @@
- * mstrtime: return a date in a readable format
- *****************************************************************************
-s is provided for any interface function which need to print a
-date. 
+ converts a mtime date into a string.
+
- * date.
- *****************************************************************************/
+/**
+ * \brief return a date in a readable format
+ * \param date to be converted
+ * \param psz_buffer should be a buffer at least MSTRTIME_MAX_SIZE characters
+ * \return psz_buffer is returned so this can be used as printf parameter.
+ */
-char *mstrtime( char *psz_buffer, mtime_t date )
-{
-    static mtime_t ll1000 = 1000, ll60 = 60, ll24 = 24;
-
-printf( psz_buffer
+nprintf( psz_buffer, MSTRTIME_MAX_SIZE
-             (int) (date / (ll1000 * ll1000 * ll60 * ll60) % ll24),
-             (int) (date / (ll1000 * ll1000 * ll60) % ll60),
@@ -83 +89 @@
-             (int) (date % ll1000) );
-    return( psz_buffer );
+}
+
+/*****************************************************************************
+ * secstotimestr: convert seconds to a time in the format h:mm:ss 
+ *****************************************************************************
+ * This function is provided for any interface function which need to print a
+ * time string in the format h:mm:ss
+ * date.
+ *****************************************************************************/
+/**
+ * \brief convert seconds to a time in the format h:mm:ss 
+ * \param secs  the date to be converted
+ * \param psz_buffer should be a buffer at least MSTRTIME_MAX_SIZE characters
+ * \return psz_buffer is returned so this can be used as printf parameter.
+ */
+char *secstotimestr( char *psz_buffer, int secs )
+{
+  snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%d:%2.2d:%2.2d",
+        (int) (secs / 3600), (int)(( secs % 3600 ) / 60), 
+        (int)(secs % 60) );
+  return( psz_buffer );
-}
-