all:

 * in vlc, times are stored in microseconds. playlist_item_t::i_duration
   shouldn't be an exception
modules/gui/wxwindows/playlist.cpp:
 * fixed indentation
parent 3291e504
......@@ -2,7 +2,7 @@
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: vlc_playlist.h,v 1.17 2003/11/26 10:45:21 zorglub Exp $
* $Id: vlc_playlist.h,v 1.18 2003/12/03 21:58:42 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -41,8 +41,7 @@ struct playlist_item_t
{
char * psz_name; /**< text describing this item */
char * psz_uri; /**< mrl of this item */
mtime_t i_duration; /**< A hint about the duration of this
* item, in miliseconds*/
mtime_t i_duration; /**< A hint about the duration of this item */
char ** ppsz_options; /**< options passed with the :foo=bar syntax */
int i_options; /**< number of items in the
* ppsz_options array */
......
......@@ -2,7 +2,7 @@
* gtk_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: playlist.c,v 1.6 2003/12/02 01:54:30 rocky Exp $
* $Id: playlist.c,v 1.7 2003/12/03 21:58:43 sigmunau Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -698,7 +698,7 @@ void GtkRebuildCList( GtkCList * p_clist, playlist_t * p_playlist )
mtime_t dur = p_playlist->pp_items[i_dummy]->i_duration;
if ( dur != -1 )
{
secstotimestr( psz_duration, dur );
secstotimestr( psz_duration, dur/1000000 );
}
else
{
......
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001, 2003 VideoLAN
* $Id: playlist.cpp,v 1.28 2003/12/03 13:35:19 rocky Exp $
* $Id: playlist.cpp,v 1.29 2003/12/03 21:58:42 sigmunau Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -399,15 +399,15 @@ void Playlist::Rebuild()
listview->SetItem(listitem);
}
{
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = p_playlist->pp_items[i]->i_duration;
if ( dur != -1 )
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = p_playlist->pp_items[i]->i_duration;
if ( dur != -1 )
{
secstotimestr( psz_duration, dur );
secstotimestr( psz_duration, dur/1000000 );
}
else
else
{
memcpy( psz_duration ,"-:--:--", sizeof("-:--:--"));
memcpy( psz_duration ,"-:--:--", sizeof("-:--:--"));
}
listview->SetItem( i, 3, psz_duration );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment