Removed b_pausable flag in favour of b_subtitle.

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index ccc0c4b16312ae0f26b6efdcc9e3b8617d49e2bb..1062b6e8fb6a7182b5027bc4c6bc2445040df122 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -344,8 +344,6 @@ struct subpicture_t
     bool            b_ephemer;    /**< If this flag is set to true the subtitle
                                 will be displayed untill the next one appear */
     bool            b_fade;                               /**< enable fading */
-    bool            b_pausable;               /**< subpicture will be paused if
-                                                            stream is paused */
     /**@}*/
 
     subpicture_region_t *p_region;  /**< region list composing this subtitle */

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index f753ff026f0dbcbe9abee9935e44cb59f9a38dd0..dc0c9f78af9605ff8a0e9e844383fa033f0b44dd 100644 (file)
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -338,8 +338,6 @@ static subpicture_t *Subtitle( decoder_t *p_dec, char *psz_subtitle, char *psz_h
         return NULL;
     }
 
-    p_spu->b_pausable = true;
-
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
     fmt.i_chroma = VLC_FOURCC('T','E','X','T');

diff --git a/modules/codec/csri.c b/modules/codec/csri.c
index 8e43d178fb4ace1685225c7d217673df422ce340..2730fe88fd0400d58675857854aff073381b57fc 100644 (file)
--- a/modules/codec/csri.c
+++ b/modules/codec/csri.c
@@ -210,7 +210,6 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_spu->i_stop = p_block->i_pts + p_block->i_length;
     p_spu->b_ephemer = false;
     p_spu->b_absolute = false;
-    p_spu->b_pausable = true;
 
     //msg_Dbg( p_dec, "BS %lf..%lf", p_spu->i_start * 0.000001, p_spu->i_stop * 0.000001);
     p_sys->pf_push_packet( p_sys->p_instance,

diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index 48da421c6c9cd6d0c14b8a660380407d5b747653..419ff204c1c2e266cb5b92dedcbd8745ec827ff0 100644 (file)
--- a/modules/codec/cvdsub.c
+++ b/modules/codec/cvdsub.c
@@ -504,8 +504,6 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
     p_spu = p_dec->pf_spu_buffer_new( p_dec );
     if( !p_spu ) return NULL;
 
-    p_spu->b_pausable = true;
-
     p_spu->i_x = p_sys->i_x_start;
     p_spu->i_x = p_spu->i_x * 3 / 4; /* FIXME: use aspect ratio for x? */
     p_spu->i_y = p_sys->i_y_start;

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 57dadf361e09d817de178b06971637bf72854507..dc83d551df20de3dd073ffb619dd6194742e14ce 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -1586,7 +1586,6 @@ static subpicture_t *render( decoder_t *p_dec )
     p_spu->i_start = (mtime_t) p_sys->i_pts;
     //p_spu->i_stop = (mtime_t) 0;
     p_spu->b_ephemer = true;
-    p_spu->b_pausable = true;
     //p_spu->b_fade = true;
     //p_spu->i_stop = p_spu->i_start + (mtime_t) (i_timeout * 1000000);
 

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 09f2ed29fc0fb1089471f297f56593109a64ba8b..29b3b2003f57dfe5eb14d4bde1541dce14d21f7f 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -584,8 +584,6 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
         return NULL;
     }
 
-    p_spu->b_pausable = true;
-
     /* these may be 0 for "not specified" */
     p_spu->i_original_picture_width = p_sys->ki.original_canvas_width;
     p_spu->i_original_picture_height = p_sys->ki.original_canvas_height;

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 02d58a37e2e2b921b56c213484302bde2f458284..c36845182d1d16bc049e0b59ae5fb2c3af508b11 100644 (file)
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -278,7 +278,6 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     p_spu->i_stop = p_block->i_pts + p_block->i_length;
     p_spu->b_ephemer = true;
     p_spu->b_absolute = true;
-    p_spu->b_pausable = true; /* ? */
 
     vlc_mutex_lock( p_sys->p_ass->p_lock );
     if( p_sys->p_track )

diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index de175a3e74831ec8f9d95e366daf6bebdfeb1eb1..5bfe1a7b751fccb0c9532798552f754c52803ca0 100644 (file)
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -76,8 +76,6 @@ subpicture_t * ParsePacket( decoder_t *p_dec )
     p_spu = p_dec->pf_spu_buffer_new( p_dec );
     if( !p_spu ) return NULL;
 
-    p_spu->b_pausable = true;
-
     /* Rationale for the "p_spudec->i_rle_size * 4": we are going to
      * expand the RLE stuff so that we won't need to read nibbles later
      * on. This will speed things up a lot. Plus, we'll only need to do

diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c
index 724b783b10b1176c5a3f6fb6c7301cdde13f2238..2417e674216f952ffc93869ca9483d7442944406 100644 (file)
--- a/modules/codec/subtitles/subsdec.c
+++ b/modules/codec/subtitles/subsdec.c
@@ -407,8 +407,6 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
         return NULL;
     }
 
-    p_spu->b_pausable = true;
-
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
     fmt.i_chroma = VLC_FOURCC('T','E','X','T');

diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c
index ff8e3d77113758e888ebe8eabf2728f59f33a439..f11bf62841ee55350b88c780dd679451c2eb6830 100644 (file)
--- a/modules/codec/subtitles/subsusf.c
+++ b/modules/codec/subtitles/subsusf.c
@@ -225,8 +225,6 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
         return NULL;
     }
 
-    p_spu->b_pausable = true;
-
     /* Decode USF strings */
     p_spu->p_region = ParseUSFString( p_dec, psz_subtitle, p_spu );
 

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index 4762b3c8ec39fd3f9287e3536addfcf9718bba22..f0d174f5d36402403bbc80cf3bae7e26e6fdb332 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -473,8 +473,6 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
     p_spu = p_dec->pf_spu_buffer_new( p_dec );
     if( !p_spu ) return NULL;
 
-    p_spu->b_pausable = true;
-
     p_spu->i_x = p_sys->i_x_start;
     p_spu->i_y = p_sys->i_y_start;
     p_spu->i_start = p_data->i_pts;

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index ebcd4467376d866111b52c02675d11e74dba1210..0be2a04a03a64be9f8738aa11bb1cead5d5d55b2 100644 (file)
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -725,7 +725,6 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     p_spu->i_stop = p_block->i_pts + p_block->i_length;
     p_spu->b_ephemer = (p_block->i_length == 0);
     p_spu->b_absolute = false;
-    p_spu->b_pausable = true;
     dbg((p_dec, "%ld --> %ld\n", (long int) p_block->i_pts/100000, (long int)p_block->i_length/100000));
 
     block_Release( p_block );

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 759d1408de3a88f876de025abf5e4cb858b30e52..233833ccf5d9378a61330a4033f1b6485659bda5 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -502,7 +502,6 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
     p_spu->i_stop = 0;
     p_spu->b_ephemer = true;
     p_spu->b_absolute = false;
-    p_spu->b_pausable = true;
 
     if( !b_text )
     {

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 496908b4b3914f84ed2350703c5511762c2bb0fa..6718c5ede1dbb2faa7002cc1ad122cd9af52d38e 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -392,7 +392,6 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
     memset( p_subpic, 0, sizeof(subpicture_t) );
     p_subpic->i_status   = RESERVED_SUBPICTURE;
     p_subpic->b_absolute = true;
-    p_subpic->b_pausable = false;
     p_subpic->b_fade     = false;
     p_subpic->b_subtitle = false;
     p_subpic->i_alpha    = 0xFF;
@@ -1225,7 +1224,7 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
 
             if( display_date > p_current->i_stop &&
                 ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) &&
-                !( p_current->b_pausable && b_paused ) )
+                !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */
             {
                 /* Too late, destroy the subpic */
                 spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );