← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to src/input/item.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/input/item.c
2
2
 * item.c: input_item management
3
3
 *****************************************************************************
4
4
 * Copyright (C) 1998-2004 the VideoLAN team
5
 
 * $Id: c8158afdaf2c89714c01fa8fde7de2ec6de86c8e $
 
5
 * $Id: 7349d9e05bce853ce87f0046373fc8d078d8f41f $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *
712
712
{
713
713
    input_item_DelInfo( p_item, psz_epg, NULL );
714
714
 
715
 
#ifdef HAVE_LOCALTIME_R
716
715
    vlc_mutex_lock( &p_item->lock );
717
716
    for( int i = 0; i < p_epg->i_event; i++ )
718
717
    {
727
726
                  1900 + tm_start.tm_year, 1 + tm_start.tm_mon, tm_start.tm_mday,
728
727
                  tm_start.tm_hour, tm_start.tm_min, tm_start.tm_sec );
729
728
        if( p_evt->psz_short_description || p_evt->psz_description )
730
 
            InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d) - %s",
 
729
            InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d) - %s %s",
731
730
                              p_evt->psz_name,
732
731
                              p_evt->i_duration/60/60, (p_evt->i_duration/60)%60,
733
 
                              p_evt->psz_short_description ? p_evt->psz_short_description : p_evt->psz_description );
 
732
                              p_evt->psz_short_description ? p_evt->psz_short_description : "" ,
 
733
                              p_evt->psz_description ? p_evt->psz_description : "" );
734
734
        else
735
735
            InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d)",
736
736
                              p_evt->psz_name,
745
745
        event.type = vlc_InputItemInfoChanged;
746
746
        vlc_event_send( &p_item->event_manager, &event );
747
747
    }
748
 
#endif
749
748
}
750
749
 
751
750