← Back to branch summary

~siretart/vlc/ubuntu

« back to all changes in this revision

Viewing changes to src/video_output/vout_subpictures.c

  • Committer: Reinhard Tartler
  • Date: 2008-09-26 06:45:40 UTC
  • mto: (21.2.1 vlc-0.9.3)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: siretart@tauware.de-20080926064540-0sd8zwmig33ksmy4
Tags: upstream-ubuntu-0.9.3
Import upstream version 0.9.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video_output/vout_subpictures.c
2
2
 * vout_subpictures.c : subpicture management functions
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2000-2007 the VideoLAN team
5
 
 * $Id: f171693c1c3b20eb5e38e9b8716ad4a37c066059 $
 
5
 * $Id: fefec27663f3961e23e97561553aa0e838dd98cc $
6
6
 *
7
7
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
8
8
 *          Samuel Hocevar <sam@zoy.org>
35
35
#include <vlc_block.h>
36
36
#include <vlc_filter.h>
37
37
#include <vlc_osd.h>
 
38
#include <vlc_input.h>  /* Used only for ugly pause workaround */
38
39
#include "../libvlc.h"
39
40
 
40
41
#include <assert.h>
957
958
    int i_source_video_width;
958
959
    int i_source_video_height;
959
960
    subpicture_t *p_subpic_v;
 
961
    bool b_paused;
 
962
 
 
963
 
 
964
    /* Get input pause status
 
965
     * XXX this is *really* ugly but it cannot be avoid without breaking 0.9 ABI */
 
966
    input_thread_t *p_input = vlc_object_find( p_spu, VLC_OBJECT_INPUT, FIND_PARENT );
 
967
    b_paused = p_input && var_GetInteger( p_input, "state" ) == PAUSE_S;
 
968
    if( p_input )
 
969
        vlc_object_release( p_input );
960
970
 
961
971
    /* Get lock */
962
972
    vlc_mutex_lock( &p_spu->subpicture_lock );