Changeset 26e60046898da4294f4686d34fbf499385bbf6d1

Timestamp:

11/08/05 00:08:50 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1123711730 +0000

git-parent:

[d8fc9f3b89c2b0409bcda5fa81a5e604103c20ef]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1123711730 +0000

Message:

Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.

To stream use a commandline similar to this:

./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv

For local playback a commandline like this is needed:

./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv

Have fun with the basic functionality - jpsaman.

Files:

• Makefile.am (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• include/stream_output.h (modified) (3 diffs)
• include/vlc_common.h (modified) (1 diff)
• include/vlc_objects.h (modified) (1 diff)
• include/vlc_osd.h (added)
• include/vlc_symbols.h (modified) (3 diffs)
• modules/LIST (modified) (1 diff)
• modules/codec/dvbsub.c (modified) (2 diffs)
• modules/control/rc.c (modified) (64 diffs)
• modules/stream_out/transcode.c (modified) (15 diffs)
• modules/video_filter/Modules.am (modified) (1 diff)
• modules/video_filter/osdmenu.c (added)
• src/Makefile.am (modified) (1 diff)
• src/misc/modules.c (modified) (1 diff)
• src/misc/objects.c (modified) (2 diffs)
• src/osd/osd.c (added)
• src/osd/osd_parser.c (added)
• src/osd/osd_widgets.c (added)

Makefile.am

@@ -113 +113 @@
-    include/vlc_meta.h \
-    include/vlc_objects.h \
+    include/vlc_osd.h \
-    include/vlc_playlist.h \
-    include/vlc_spu.h \
@@ -383 +384 @@
-    src/stream_output/sap.c \
-    src/stream_output/acl.c \
+    src/osd/osd.c \
+    src/osd/osd_widgets.c \
+    src/osd/osd_parser.c \
-    src/misc/charset.c \
-    src/misc/httpd.c \
@@ -814 +818 @@
-    done
-
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/selected"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/unselect"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/selection"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/volume"
+    for i in $(srcdir)/share/osdmenu/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/ || true ; \
+      unix2dos $(srcdir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
+    done
+    for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
+    done
+
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/selected"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/selection"
+    mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/volume"
+    for i in $(srcdir)/share/osdmenu/default/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
+    done
+    for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
+      cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+    done
+
-    mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-    mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"

configure.ac

@@ -2690 +2690 @@
-    VLC_ADD_LDFLAGS([png],[-lpng -lz])
-    VLC_ADD_PLUGINS([png])
+    VLC_ADD_PLUGINS([osdmenu])
-    AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
-    [],[-lz])

include/stream_output.h

@@ -2 +2 @@
- * stream_output.h : stream output module
- *****************************************************************************
-
+-2005
- * $Id$
- *
@@ -8 +8 @@
- *          Laurent Aimar <fenrir@via.ecp.fr>
- *          Eric Petit <titer@videolan.org>
+ *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -207 +208 @@
-    char              *psz_next;
-
+    /* Subpicture unit */
+    spu_t             *p_spu;
+    
-    /* add, remove a stream */
-    sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * );

include/vlc_common.h

@@ -405 +405 @@
-typedef struct opengl_t     opengl_t;
-typedef struct opengl_sys_t opengl_sys_t;
+
+/* osdmenu */
+typedef struct osd_menu_t   osd_menu_t;
+typedef struct osd_state_t  osd_state_t;
+typedef struct osd_event_t  osd_event_t;
+typedef struct osd_button_t osd_button_t;
+typedef struct osd_menu_state_t osd_menu_state_t;
-
-/* VLM */

include/vlc_objects.h

@@ -60 +60 @@
-#define VLC_OBJECT_SD         (-26)
-#define VLC_OBJECT_XML        (-27)
+#define VLC_OBJECT_OSDMENU    (-28)
-
-#define VLC_OBJECT_GENERIC  (-666)

include/vlc_symbols.h

@@ -392 +392 @@
-    int (*vlc_scandir_inner) (const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ));
-    int (*vlc_alphasort_inner) (const struct dirent **a, const struct dirent **b);
+    osd_state_t * (*__osd_StateChange_inner) (osd_state_t *, const int);
+    picture_t * (*osd_Slider_inner) (int i_width, int i_height, int i_position, short i_type);
+    void (*osd_ConfigUnload_inner) (vlc_object_t *, osd_menu_t **);
+    void (*__osd_MenuShow_inner) (vlc_object_t *);
+    picture_t * (*osd_Icon_inner) (int i_width, int i_height, short i_type);
+    void (*__osd_VolumeDown_inner) (vlc_object_t *);
+    void (*__osd_MenuNext_inner) (vlc_object_t *);
+    void (*__osd_MenuDelete_inner) (vlc_object_t *, osd_menu_t *);
+    void (*__osd_MenuHide_inner) (vlc_object_t *);
+    int (*osd_ConfigLoader_inner) (vlc_object_t *, const char *, osd_menu_t **);
+    void (*__osd_MenuUp_inner) (vlc_object_t *);
+    void (*__osd_MenuDown_inner) (vlc_object_t *);
+    osd_menu_t * (*__osd_MenuCreate_inner) (vlc_object_t *, const char *);
+    void (*__osd_MenuPrev_inner) (vlc_object_t *);
+    void (*__osd_VolumeUp_inner) (vlc_object_t *);
+    void (*__osd_MenuActivate_inner) (vlc_object_t *);
-};
-# if defined (__PLUGIN__)
@@ -767 +783 @@
-#  define vlc_scandir (p_symbols)->vlc_scandir_inner
-#  define vlc_alphasort (p_symbols)->vlc_alphasort_inner
+#  define __osd_StateChange (p_symbols)->__osd_StateChange_inner
+#  define osd_Slider (p_symbols)->osd_Slider_inner
+#  define osd_ConfigUnload (p_symbols)->osd_ConfigUnload_inner
+#  define __osd_MenuShow (p_symbols)->__osd_MenuShow_inner
+#  define osd_Icon (p_symbols)->osd_Icon_inner
+#  define __osd_VolumeDown (p_symbols)->__osd_VolumeDown_inner
+#  define __osd_MenuNext (p_symbols)->__osd_MenuNext_inner
+#  define __osd_MenuDelete (p_symbols)->__osd_MenuDelete_inner
+#  define __osd_MenuHide (p_symbols)->__osd_MenuHide_inner
+#  define osd_ConfigLoader (p_symbols)->osd_ConfigLoader_inner
+#  define __osd_MenuUp (p_symbols)->__osd_MenuUp_inner
+#  define __osd_MenuDown (p_symbols)->__osd_MenuDown_inner
+#  define __osd_MenuCreate (p_symbols)->__osd_MenuCreate_inner
+#  define __osd_MenuPrev (p_symbols)->__osd_MenuPrev_inner
+#  define __osd_VolumeUp (p_symbols)->__osd_VolumeUp_inner
+#  define __osd_MenuActivate (p_symbols)->__osd_MenuActivate_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1145 +1177 @@
-    ((p_symbols)->vlc_scandir_inner) = vlc_scandir; \
-    ((p_symbols)->vlc_alphasort_inner) = vlc_alphasort; \
+    ((p_symbols)->__osd_StateChange_inner) = __osd_StateChange; \
+    ((p_symbols)->osd_Slider_inner) = osd_Slider; \
+    ((p_symbols)->osd_ConfigUnload_inner) = osd_ConfigUnload; \
+    ((p_symbols)->__osd_MenuShow_inner) = __osd_MenuShow; \
+    ((p_symbols)->osd_Icon_inner) = osd_Icon; \
+    ((p_symbols)->__osd_VolumeDown_inner) = __osd_VolumeDown; \
+    ((p_symbols)->__osd_MenuNext_inner) = __osd_MenuNext; \
+    ((p_symbols)->__osd_MenuDelete_inner) = __osd_MenuDelete; \
+    ((p_symbols)->__osd_MenuHide_inner) = __osd_MenuHide; \
+    ((p_symbols)->osd_ConfigLoader_inner) = osd_ConfigLoader; \
+    ((p_symbols)->__osd_MenuUp_inner) = __osd_MenuUp; \
+    ((p_symbols)->__osd_MenuDown_inner) = __osd_MenuDown; \
+    ((p_symbols)->__osd_MenuCreate_inner) = __osd_MenuCreate; \
+    ((p_symbols)->__osd_MenuPrev_inner) = __osd_MenuPrev; \
+    ((p_symbols)->__osd_VolumeUp_inner) = __osd_VolumeUp; \
+    ((p_symbols)->__osd_MenuActivate_inner) = __osd_MenuActivate; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->vlc_fix_readdir_charset_deprecated = NULL; \

modules/LIST

@@ -343 +343 @@
- * opie: interface for Opie using QT/Embedded library.
-
+ * osdmenu: video_filter for displaying and streaming a On Screen Display menu
+
- * oss: audio output module using the OSS /dev/dsp interface.
- 

modules/codec/dvbsub.c

@@ -1558 +1558 @@
-}
-
+/* FIXME: this routine is a hack to convert VLC_FOURCC('Y','U','V','A') 
+ *        into VLC_FOURCC('Y','U','V','P')
+ */
+static subpicture_t *YuvaYuvp( encoder_t *p_enc, subpicture_t *p_subpic )
+{
+    subpicture_region_t *p_region = NULL;
+     
+    for( p_region = p_subpic->p_region; p_region; p_region = p_region->p_next )
+    {
+        video_format_t *p_fmt = &p_region->fmt;
+        int i = 0, j = 0, n = 0, p = 0;
+        int i_max_entries = 256;
+
+#ifdef RANDOM_DITHERING
+        int i_seed = 0xdeadbeef; /* random seed */
+#else
+        int *pi_delta;
+#endif
+        int i_pixels = p_region->picture.p[0].i_visible_lines
+                        * p_region->picture.p[0].i_pitch;
+        int i_iterator = p_region->picture.p[0].i_visible_lines * 3 / 4
+                            * p_region->picture.p[0].i_pitch
+                        + p_region->picture.p[0].i_pitch * 1 / 3;
+        int i_tolerance = 0;
+    
+        p_fmt->i_chroma = VLC_FOURCC('Y','U','V','P');
+        p_fmt->p_palette = (video_palette_t *) malloc( sizeof( video_palette_t ) );
+        p_fmt->p_palette->i_entries = 0;
+    
+        /* Find best iterator using Euclide’s algorithm */
+        for( ; i_iterator > 1 ; i_iterator-- )
+        {
+            int a = i_pixels;
+            int b = i_iterator;
+            int c;
+    
+            while( b )
+            {
+                c = a % b;
+                a = b;
+                b = c;
+            }
+    
+            if( a == 1 )
+            {
+                break;
+            }
+        }
+    
+        /* Count colors, build best palette */
+        for( i_tolerance = 0; i_tolerance < 128; i_tolerance++ )
+        {
+            vlc_bool_t b_success = VLC_TRUE;
+            p_fmt->p_palette->i_entries = 0;
+    
+            for( i = 0; i < i_pixels ; )
+            {
+                uint8_t y, u, v, a;
+                y = p_region->picture.p[0].p_pixels[i];
+                u = p_region->picture.p[1].p_pixels[i];
+                v = p_region->picture.p[2].p_pixels[i];
+                a = p_region->picture.p[3].p_pixels[i];
+                for( j = 0; j < p_fmt->p_palette->i_entries; j++ )
+                {
+                    if( abs((int)p_fmt->p_palette->palette[j][0] - (int)y) <= i_tolerance &&
+                        abs((int)p_fmt->p_palette->palette[j][1] - (int)u) <= i_tolerance &&
+                        abs((int)p_fmt->p_palette->palette[j][2] - (int)v) <= i_tolerance &&
+                        abs((int)p_fmt->p_palette->palette[j][3] - (int)a) <= i_tolerance / 2 )
+                    {
+                        break;
+                    }
+                }
+                if( j == p_fmt->p_palette->i_entries )
+                {
+                    p_fmt->p_palette->palette[j][0] = y;
+                    p_fmt->p_palette->palette[j][1] = u;
+                    p_fmt->p_palette->palette[j][2] = v;
+                    p_fmt->p_palette->palette[j][3] = a;
+                    p_fmt->p_palette->i_entries++;
+                }
+                if( p_fmt->p_palette->i_entries >= i_max_entries )
+                {
+                    b_success = VLC_FALSE;
+                    break;
+                }
+                i += i_iterator;
+                if( i > i_pixels )
+                {
+                    i -= i_pixels;
+                }
+            }
+    
+            if( b_success )
+            {
+                break;
+            }
+        }
+    
+#if DEBUG_DVBSUB
+        msg_Dbg( p_enc, "best palette has %d colors", p_fmt->p_palette->i_entries );
+#endif
+
+#ifndef RANDOM_DITHERING
+        pi_delta = malloc( ( p_region->picture.p[0].i_pitch + 1 )
+                            * sizeof(int) * 4  );
+        for( i = 0; i < (p_region->picture.p[0].i_pitch + 1) * 4 ; i++ )
+        {
+            pi_delta[ i ] = 0;
+        }
+#endif
+
+        /* Fill image with our new colours */
+        for( p = 0; p < p_region->picture.p[0].i_visible_lines ; p++ )
+        {
+            int i_ydelta = 0, i_udelta = 0, i_vdelta = 0, i_adelta = 0;
+    
+            for( n = 0; n < p_region->picture.p[0].i_pitch ; n++ )
+            {
+                int i_offset = p * p_region->picture.p[0].i_pitch + n;
+                int y, u, v, a;
+                int i_mindist, i_best;
+    
+                y = (int)p_region->picture.p[0].p_pixels[i_offset];
+                u = (int)p_region->picture.p[1].p_pixels[i_offset];
+                v = (int)p_region->picture.p[2].p_pixels[i_offset];
+                a = (int)p_region->picture.p[3].p_pixels[i_offset];
+    
+                /* Add dithering compensation */
+#ifdef RANDOM_DITHERING
+                y += ((i_seed & 0xff) - 0x80) * i_tolerance / 0x80;
+                u += (((i_seed >> 8) & 0xff) - 0x80) * i_tolerance / 0x80;
+                v += (((i_seed >> 16) & 0xff) - 0x80) * i_tolerance / 0x80;
+                a += (((i_seed >> 24) & 0xff) - 0x80) * i_tolerance / 0x80;
+#else
+                y += i_ydelta + pi_delta[ n * 4 ];
+                u += i_udelta + pi_delta[ n * 4 + 1 ];
+                v += i_vdelta + pi_delta[ n * 4 + 2 ];
+                a += i_adelta + pi_delta[ n * 4 + 3 ];
+#endif
+
+                /* Find best colour in palette */
+                for( i_mindist = 99999999, i_best = 0, j = 0; j < p_fmt->p_palette->i_entries; j++ )
+                {
+                    int i_dist = 0;
+    
+                    i_dist += abs((int)p_fmt->p_palette->palette[j][0] - y);
+                    i_dist += abs((int)p_fmt->p_palette->palette[j][1] - u);
+                    i_dist += abs((int)p_fmt->p_palette->palette[j][2] - v);
+                    i_dist += 2 * abs((int)p_fmt->p_palette->palette[j][3] - a);
+    
+                    if( i_dist < i_mindist )
+                    {
+                        i_mindist = i_dist;
+                        i_best = j;
+                    }
+                }
+    
+                /* Set pixel to best color */
+                p_region->picture.p[0].p_pixels[i_offset] = i_best;
+    
+                /* Update dithering state */
+#ifdef RANDOM_DITHERING
+                i_seed = (i_seed * 0x1283837) ^ 0x789479 ^ (i_seed >> 13);
+#else
+                i_ydelta = y - (int)p_fmt->p_palette->palette[i_best][0];
+                i_udelta = u - (int)p_fmt->p_palette->palette[i_best][1];
+                i_vdelta = v - (int)p_fmt->p_palette->palette[i_best][2];
+                i_adelta = a - (int)p_fmt->p_palette->palette[i_best][3];
+                pi_delta[ n * 4 ] = i_ydelta * 3 / 8;
+                pi_delta[ n * 4 + 1 ] = i_udelta * 3 / 8;
+                pi_delta[ n * 4 + 2 ] = i_vdelta * 3 / 8;
+                pi_delta[ n * 4 + 3 ] = i_adelta * 3 / 8;
+                i_ydelta = i_ydelta * 5 / 8;
+                i_udelta = i_udelta * 5 / 8;
+                i_vdelta = i_vdelta * 5 / 8;
+                i_adelta = i_adelta * 5 / 8;
+#endif
+            }
+        }
+#ifndef RANDOM_DITHERING
+        free( pi_delta );
+#endif
+
+        /* pad palette */
+        for( i = p_fmt->p_palette->i_entries; i < i_max_entries; i++ )
+        {
+            p_fmt->p_palette->palette[i][0] = 0;
+            p_fmt->p_palette->palette[i][1] = 0;
+            p_fmt->p_palette->palette[i][2] = 0;
+            p_fmt->p_palette->palette[i][3] = 0;
+        }
+        p_fmt->p_palette->i_entries = i_max_entries;
+#if DEBUG_DVBSUB
+        msg_Dbg( p_enc, "best palette has %d colors", p_fmt->p_palette->i_entries );
+#endif
+    }
+    return p_subpic;
+} /* End of hack */
+
-/****************************************************************************
- * Encode: the whole thing
@@ -1563 +1762 @@
-static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
-{
+    subpicture_t *p_temp = NULL;
+    subpicture_region_t *p_region = NULL;
-    bs_t bits, *s = &bits;
-    block_t *p_block;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#if DEBUG_DVBSUB
-    msg_Dbg( p_enc, "encoding subpicture" );

modules/control/rc.c

@@ -6 +6 @@
- *
- * Author: Peter Surda <shurdeek@panorama.sth.ac.at>
+ *         Jean-Paul Saman <jpsaman #_at_# m2x _replaceWith#dot_ nl>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -37 +38 @@
-#include <vlc/aout.h>
-#include <vlc/vout.h>
+#include <vlc_osd.h>
-
-#ifdef HAVE_UNISTD_H
@@ -59 +61 @@
-
-#define MAX_LINE_LENGTH 256
+#define STATUS_CHANGE "status change: "
-
-/*****************************************************************************
@@ -66 +69 @@
-static void Deactivate   ( vlc_object_t * );
-static void Run          ( intf_thread_t * );
+
+static void Help         ( intf_thread_t *, vlc_bool_t );
-
-static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
@@ -87 +92 @@
-static int  AudioConfig  ( vlc_object_t *, char const *,
-                           vlc_value_t, vlc_value_t, void * );
+static int  Menu         ( vlc_object_t *, char const *,
+                           vlc_value_t, vlc_value_t, void * );
+
+/* Status Callbacks */
+static int TimeOffsetChanged( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t , void * );
+static int VolumeChanged    ( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t, void * );
+static int StateChanged     ( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t, void * );
+static int RateChanged      ( vlc_object_t *, char const *,
+                              vlc_value_t, vlc_value_t, void * );
-
-struct intf_sys_t
@@ -94 +111 @@
-    char *psz_unix_path;
-
+    /* status changes */
+    vlc_mutex_t       status_lock;
+    playlist_status_t i_last_state;
+    
-#ifdef WIN32
-    HANDLE hConsoleIn;
@@ -109 +130 @@
-    va_list args;
-    va_start( args, psz_fmt );
-
+
+
-    else
-
-
+
+
+
+
-    va_end( args );
-}
@@ -171 +195 @@
-    playlist_t *p_playlist;
-    char *psz_host, *psz_unix_path;
-
+ 
-
-#if defined(HAVE_ISATTY) && !defined(WIN32)
@@ -274 +298 @@
-    p_intf->p_sys->i_socket = -1;
-    p_intf->p_sys->psz_unix_path = psz_unix_path;
-
+
+
+
-    /* Non-buffered stdout */
-    setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
@@ -319 +345 @@
-        free( p_intf->p_sys->psz_unix_path );
-    }
+    vlc_mutex_destroy( &p_intf->p_sys->status_lock );    
-    free( p_intf->p_sys );
-}
@@ -438 +465 @@
-    var_Create( p_intf, "logo-transparency", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_intf, "logo-transparency", Other, NULL );
-
-
+
+
+
+
+
+
-    var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_intf, "pause", Input, NULL );
@@ -461 +492 @@
-    var_Create( p_intf, "rewind", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_intf, "rewind", Input, NULL );
-
+
+
+
+
+
+
+
+
-    var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_intf, "volume", Volume, NULL );
@@ -473 +511 @@
-    var_AddCallback( p_intf, "achan", AudioConfig, NULL );
-
+    /* status callbacks */
+    /* Listen to audio volume updates */
+    var_AddCallback( p_intf->p_vlc, "audio-volume", VolumeChanged, p_intf );
+    
-#ifdef WIN32
-    /* Get the file descriptor of the console input */
@@ -515 +557 @@
-                }
-            }
+            /* New input has been registered */
+            if( p_input )
+            {
+                if( !p_input->b_dead || !p_input->b_die )
+                {
+                    msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri );
+                    msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" ));
+                }
+                var_AddCallback( p_input, "state", StateChanged, p_intf );
+                var_AddCallback( p_input, "rate-faster", RateChanged, p_intf );
+                var_AddCallback( p_input, "rate-slower", RateChanged, p_intf );
+                var_AddCallback( p_input, "rate", RateChanged, p_intf );
+                var_AddCallback( p_input, "time-offset", TimeOffsetChanged, p_intf );
+            }
-        }
-        else if( p_input->b_dead )
-        {
+            var_DelCallback( p_input, "state", StateChanged, p_intf );
+            var_DelCallback( p_input, "rate-faster", RateChanged, p_intf );
+            var_DelCallback( p_input, "rate-slower", RateChanged, p_intf );
+            var_DelCallback( p_input, "rate", RateChanged, p_intf );
+            var_DelCallback( p_input, "time-offset", TimeOffsetChanged, p_intf );
-            vlc_object_release( p_input );
-            p_input = NULL;
+
+            if( p_playlist )
+            {
+                vlc_mutex_lock( &p_playlist->object_lock );
+                p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
+                msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+                vlc_mutex_unlock( &p_playlist->object_lock );
+            }
+        }
+        
+        if( (p_input != NULL) && !p_input->b_dead && !p_input->b_die &&
+            (p_playlist != NULL) )
+        {
+            vlc_mutex_lock( &p_playlist->object_lock );
+            if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
+                (p_playlist->status.i_status == PLAYLIST_STOPPED) )
+            {
+                p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
+                msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+            }
+            else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
+                (p_playlist->status.i_status == PLAYLIST_RUNNING) )
+            {
+                p_intf->p_sys->i_last_state = p_playlist->status.i_status;
+                msg_rc( STATUS_CHANGE "( play state: 1 )\r\n" );
+            }
+            else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
+                (p_playlist->status.i_status == PLAYLIST_PAUSED) )
+            {
+                p_intf->p_sys->i_last_state = p_playlist->status.i_status;
+                msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" );
+            }
+            vlc_mutex_unlock( &p_playlist->object_lock );
-        }
-
@@ -633 +727 @@
-            {
-                msg_rc( "1\n" );
+
+                /* FIXME: This is a hack */
+                /* Replay the current state of the system. */
+                msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri );
+                msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" ));
+
+                if( p_playlist )
+                {
+                    vlc_mutex_lock( &p_playlist->object_lock );
+                    switch( p_playlist->status.i_status )
+                    {
+                        case PLAYLIST_STOPPED:
+                            msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+                            break;
+                        case PLAYLIST_RUNNING:
+                            msg_rc( STATUS_CHANGE "( play state: %d )\r\n", var_GetInteger( p_input, "state" ) );
+                            break;
+                        case PLAYLIST_PAUSED:
+                            msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" );
+                            break;
+                        default:
+                            msg_rc( STATUS_CHANGE "( state unknown )\r\n" );
+                            break;
+                    }
+                    vlc_mutex_unlock( &p_playlist->object_lock );
+                } /* End of current playlist status */                
-            }
-        }
@@ -678 +798 @@
-                 b_longhelp = VLC_TRUE;
-            else b_longhelp = VLC_FALSE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-        else switch( psz_cmd[0] )
@@ -791 +837 @@
-    }
-
+    msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+    msg_rc( STATUS_CHANGE "( quit )\r\n" );
+
-    if( p_input )
-    {
+        var_DelCallback( p_input, "state", StateChanged, p_intf );
+        var_DelCallback( p_input, "rate-faster", RateChanged, p_intf );
+        var_DelCallback( p_input, "rate-slower", RateChanged, p_intf );
+        var_DelCallback( p_input, "rate", RateChanged, p_intf );
+        var_DelCallback( p_input, "time-offset", TimeOffsetChanged, p_intf );
-        vlc_object_release( p_input );
-        p_input = NULL;
@@ -802 +856 @@
-        p_playlist = NULL;
-    }
+    
+    var_DelCallback( p_intf->p_vlc, "audio-volume", VolumeChanged, p_intf );
-}
-
+static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
+{                
+    msg_rc(_("+----[ Remote control commands ]\n"));
+    msg_rc(  "| \n");
+    msg_rc(_("| add XYZ  . . . . . . . . . . add XYZ to playlist\n"));
+    msg_rc(_("| playlist . . .  show items currently in playlist\n"));
+    msg_rc(_("| play . . . . . . . . . . . . . . . . play stream\n"));
+    msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream\n"));
+    msg_rc(_("| next . . . . . . . . . . . .  next playlist item\n"));
+    msg_rc(_("| prev . . . . . . . . . .  previous playlist item\n"));
+    msg_rc(_("| goto . . . . . . . . . . . .  goto item at index\n"));
+    msg_rc(_("| title [X]  . . . . set/get title in current item\n"));
+    msg_rc(_("| title_n  . . . . . .  next title in current item\n"));
+    msg_rc(_("| title_p  . . . .  previous title in current item\n"));
+    msg_rc(_("| chapter [X]  . . set/get chapter in current item\n"));
+    msg_rc(_("| chapter_n  . . . .  next chapter in current item\n"));
+    msg_rc(_("| chapter_p  . .  previous chapter in current item\n"));
+    msg_rc(  "| \n");
+    msg_rc(_("| seek X . seek in seconds, for instance `seek 12'\n"));
+    msg_rc(_("| pause  . . . . . . . . . . . . . .  toggle pause\n"));
+    msg_rc(_("| fastforward  . . . . . .  .  set to maximum rate\n"));
+    msg_rc(_("| rewind  . . . . . . . . . .  set to minimum rate\n"));
+    msg_rc(_("| faster . . . . . . . .  faster playing of stream\n"));
+    msg_rc(_("| slower . . . . . . . .  slower playing of stream\n"));
+    msg_rc(_("| normal . . . . . . . .  normal playing of stream\n"));
+    msg_rc(_("| f  . . . . . . . . . . . . . . toggle fullscreen\n"));
+    msg_rc(_("| info . . .  information about the current stream\n"));
+    msg_rc(  "| \n");
+    msg_rc(_("| volume [X] . . . . . . . .  set/get audio volume\n"));
+    msg_rc(_("| volup [X]  . . . . .  raise audio volume X steps\n"));
+    msg_rc(_("| voldown [X]  . . . .  lower audio volume X steps\n"));