Removes trailing spaces. Removes tabs.

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 74931894142eb2ca4774d600e1236af0eb06c54a..d7a92f8e8d87bd0b4477aa1a8a1b729257894b7b 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -53,6 +53,8 @@
  * helpers */
 #include "input/input_internal.h"
 
+#include "modules/modules.h"
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -81,6 +83,9 @@ int vout_Snapshot( vout_thread_t *, picture_t * );
 static int ParseVideoFilter2Chain( vout_thread_t *, char * );
 static void RemoveVideoFilters2( vout_thread_t *p_vout );
 
+/* Display media title in OSD */
+static void DisplayTitleOnOSD( vout_thread_t *p_vout );
+
 /*****************************************************************************
  * Video Filter2 functions
  *****************************************************************************/
@@ -203,6 +208,8 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
             /* This video output is cool! Hijack it. */
             spu_Attach( p_vout->p_spu, p_this, VLC_TRUE );
             vlc_object_attach( p_vout, p_this );
+            if( p_vout->b_title_show )
+                DisplayTitleOnOSD( p_vout );
             vlc_object_release( p_vout );
         }
     }
@@ -425,7 +432,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     }
     var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
 
-
     var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     text.psz_string = _("Filters");
     var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
@@ -459,8 +465,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
         msg_Err( p_vout, "video output creation failed" );
 
         /* Make sure the thread is destroyed */
-        p_vout->b_die = VLC_TRUE;
-
+        vlc_object_kill( p_vout );
         vlc_thread_join( p_vout );
 
         vlc_object_detach( p_vout );
@@ -485,7 +490,7 @@ void vout_Destroy( vout_thread_t *p_vout )
     playlist_t *p_playlist = pl_Yield( p_vout );
 
     /* Request thread destruction */
-    p_vout->b_die = VLC_TRUE;
+    vlc_object_kill( p_vout );
     vlc_thread_join( p_vout );
 
     var_Destroy( p_vout, "intf-change" );
@@ -755,6 +760,9 @@ static void RunThread( vout_thread_t *p_vout)
         return;
     }
 
+    if( p_vout->b_title_show )
+        DisplayTitleOnOSD( p_vout );
+
     /*
      * Main loop - it is not executed if an error occurred during
      * initialization
@@ -973,7 +981,8 @@ static void RunThread( vout_thread_t *p_vout)
 
                 p_vfilter->p_cfg = p_vout->p_vfilters_cfg[i];
                 p_vfilter->p_module = module_Need( p_vfilter, "video filter2",
-                                                 p_vout->psz_vfilters[i], 0 );
+                                                   p_vout->psz_vfilters[i],
+                                                   VLC_TRUE );
 
                 if( p_vfilter->p_module )
                 {
@@ -1439,10 +1448,6 @@ static void SuxorRestartVideoES( suxor_thread_t *p_this )
 
     vlc_object_release( p_this->p_input );
 
-#ifdef WIN32
-    CloseHandle( p_this->thread_id );
-#endif
-
     vlc_object_destroy( p_this );
 }
 
@@ -1625,3 +1630,72 @@ static void RemoveVideoFilters2( vout_thread_t *p_vout )
     }
     p_vout->i_vfilters = 0;
 }
+
+static void DisplayTitleOnOSD( vout_thread_t *p_vout )
+{
+    input_thread_t *p_input;
+    mtime_t i_now, i_stop;
+
+    p_input = (input_thread_t *)vlc_object_find( p_vout,
+              VLC_OBJECT_INPUT, FIND_ANYWHERE );
+    if( p_input )
+    {
+        i_now = mdate();
+        i_stop = i_now + (mtime_t)(p_vout->i_title_timeout * 1000);
+        char *psz_nowplaying =
+            input_item_GetNowPlaying( input_GetItem( p_input ) );
+        char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
+        char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
+        if( EMPTY_STR( psz_name ) )
+            {
+                free( psz_name );
+                psz_name = input_item_GetName( input_GetItem( p_input ) );
+            }
+        if( !EMPTY_STR( psz_nowplaying ) )
+        {
+            vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+                                   psz_nowplaying, NULL,
+                                   p_vout->i_title_position,
+                                   30 + p_vout->fmt_in.i_width
+                                      - p_vout->fmt_in.i_visible_width
+                                      - p_vout->fmt_in.i_x_offset,
+                                   20 + p_vout->fmt_in.i_y_offset,
+                                   i_now, i_stop );
+        }
+        else if( !EMPTY_STR( psz_artist ) )
+        {
+            char *psz_string = NULL;
+
+            psz_string = malloc( strlen( psz_name ) + strlen( psz_artist ) );
+            if( psz_string )
+            {
+                sprintf( psz_string, "%s - %s", psz_name, psz_artist );
+
+                vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+                                       psz_string, NULL,
+                                       p_vout->i_title_position,
+                                       30 + p_vout->fmt_in.i_width
+                                          - p_vout->fmt_in.i_visible_width
+                                          - p_vout->fmt_in.i_x_offset,
+                                       20 + p_vout->fmt_in.i_y_offset,
+                                       i_now, i_stop );
+                free( psz_string );
+            }
+        }
+        else
+        {
+            vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+                                   psz_name, NULL,
+                                   p_vout->i_title_position,
+                                   30 + p_vout->fmt_in.i_width
+                                      - p_vout->fmt_in.i_visible_width
+                                      - p_vout->fmt_in.i_x_offset,
+                                   20 + p_vout->fmt_in.i_y_offset,
+                                   i_now, i_stop );
+        }
+        vlc_object_release( p_input );
+        free( psz_artist );
+        free( psz_name );
+        free( psz_nowplaying );
+    }
+}