r126 - in unstable/vlc/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-01-08 02:27:58 +0000 (Mon, 08 Jan 2007)
New Revision: 126

Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/patches/patch-mozilla-plugin-0.8.6debian-0.8.6a.diff
Log:
  * Fix incomplete patch.


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2007-01-08 02:02:15 UTC (rev 125)
+++ unstable/vlc/debian/changelog	2007-01-08 02:27:58 UTC (rev 126)
@@ -1,4 +1,4 @@
-vlc (0.8.6-svn20061012.debian-2) UNRELAESED; urgency=high
+vlc (0.8.6-svn20061012.debian-2) UNRELEASED; urgency=high
 
   * Maintainer upload.
   * Acknowledge previous NMUs by Andreas Barth. Thanks.

Modified: unstable/vlc/debian/patches/patch-mozilla-plugin-0.8.6debian-0.8.6a.diff
===================================================================
--- unstable/vlc/debian/patches/patch-mozilla-plugin-0.8.6debian-0.8.6a.diff	2007-01-08 02:02:15 UTC (rev 125)
+++ unstable/vlc/debian/patches/patch-mozilla-plugin-0.8.6debian-0.8.6a.diff	2007-01-08 02:27:58 UTC (rev 126)
@@ -206,6 +206,83 @@
 +    RAISENULL("Invalid log iterator!");
 +}
 +
+diff -puriN vlc-0.8.6/src/misc/messages.c vlc-0.8.6a/src/misc/messages.c
+--- vlc-0.8.6/src/misc/messages.c	2006-09-21 17:50:20.000000000 +0200
++++ vlc-0.8.6a/src/misc/messages.c	2007-01-07 23:06:39.000000000 +0100
+@@ -4,7 +4,7 @@
+  * modules, especially intf modules. See config.h for output configuration.
+  *****************************************************************************
+  * Copyright (C) 1998-2005 the VideoLAN team
+- * $Id: messages.c 16767 2006-09-21 14:32:45Z hartman $
++ * $Id: messages.c 17413 2006-11-01 23:09:50Z damienf $
+  *
+  * Authors: Vincent Seguin <seguin at via.ecp.fr>
+  *          Samuel Hocevar <sam at zoy.org>
+@@ -231,6 +231,33 @@ void __msg_Unsubscribe( vlc_object_t *p_
+     vlc_mutex_unlock( &p_bank->lock );
+ }
+ 
++const char *msg_GetObjectTypeName(int i_object_type )
++{
++    switch( i_object_type )
++    {
++        case VLC_OBJECT_ROOT: return "root";
++        case VLC_OBJECT_MODULE: return "module";
++        case VLC_OBJECT_INTF: return "interface";
++        case VLC_OBJECT_PLAYLIST: return "playlist";
++        case VLC_OBJECT_ITEM: return "item";
++        case VLC_OBJECT_INPUT: return "input";
++        case VLC_OBJECT_DECODER: return "decoder";
++        case VLC_OBJECT_PACKETIZER: return "packetizer";
++        case VLC_OBJECT_ENCODER: return "encoder";
++        case VLC_OBJECT_VOUT: return "video output";
++        case VLC_OBJECT_AOUT: return "audio output";
++        case VLC_OBJECT_SOUT: return "stream output";
++        case VLC_OBJECT_HTTPD: return "http server";
++        case VLC_OBJECT_HTTPD_HOST: return "http server";
++        case VLC_OBJECT_DIALOGS: return "dialogs provider";
++        case VLC_OBJECT_VLM: return "vlm";
++        case VLC_OBJECT_ANNOUNCE: return "announce handler";
++        case VLC_OBJECT_DEMUX: return "demuxer";
++        case VLC_OBJECT_ACCESS: return "access";
++        default: return "private";
++    }
++}
++
+ /*****************************************************************************
+  * __msg_*: print a message
+  *****************************************************************************
+@@ -558,29 +585,7 @@ static void PrintMsg ( vlc_object_t * p_
+             break;
+     }
+ 
+-    switch( p_item->i_object_type )
+-    {
+-        case VLC_OBJECT_ROOT: psz_object = "root"; break;
+-        case VLC_OBJECT_VLC: psz_object = "vlc"; break;
+-        case VLC_OBJECT_MODULE: psz_object = "module"; break;
+-        case VLC_OBJECT_INTF: psz_object = "interface"; break;
+-        case VLC_OBJECT_PLAYLIST: psz_object = "playlist"; break;
+-        case VLC_OBJECT_ITEM: psz_object = "item"; break;
+-        case VLC_OBJECT_INPUT: psz_object = "input"; break;
+-        case VLC_OBJECT_DECODER: psz_object = "decoder"; break;
+-        case VLC_OBJECT_PACKETIZER: psz_object = "packetizer"; break;
+-        case VLC_OBJECT_ENCODER: psz_object = "encoder"; break;
+-        case VLC_OBJECT_VOUT: psz_object = "video output"; break;
+-        case VLC_OBJECT_AOUT: psz_object = "audio output"; break;
+-        case VLC_OBJECT_SOUT: psz_object = "stream output"; break;
+-        case VLC_OBJECT_HTTPD: psz_object = "http server"; break;
+-        case VLC_OBJECT_HTTPD_HOST: psz_object = "http server"; break;
+-        case VLC_OBJECT_DIALOGS: psz_object = "dialogs provider"; break;
+-        case VLC_OBJECT_VLM: psz_object = "vlm"; break;
+-        case VLC_OBJECT_ANNOUNCE: psz_object = "announce handler"; break;
+-        case VLC_OBJECT_DEMUX: psz_object = "demuxer"; break;
+-        case VLC_OBJECT_ACCESS: psz_object = "access"; break;
+-    }
++    psz_object = msg_GetObjectTypeName(p_item->i_object_type);
+ 
+ #ifdef UNDER_CE
+ #   define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile, \
 diff -puriN vlc-0.8.6/src/control/video.c vlc-0.8.6a/src/control/video.c
 --- vlc-0.8.6/src/control/video.c	2006-10-04 15:47:05.000000000 +0200
 +++ vlc-0.8.6a/src/control/video.c	2007-01-07 23:06:38.000000000 +0100