Changeset 1e9ecb9029e00ada8ceced3d60c54570bd7c1a84

Timestamp:

23/04/04 14:46:34 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1082724394 +0000

git-parent:

[c55e169d9b8c5e6907ffba8b5a0e0e3396735b13]

git-author:

Gildas Bazin <gbazin@videolan.org> 1082724394 +0000

Message:

* src/input/control.c, include/ninput.h: Added INPUT_GET_INFO.
* include/vlc_meta.h: vlc_meta_GetValue().
* modules/demux/m3u.c: increased MAX_LINE to 8192.
* modules/video_output/directx/events.c: portability fix.

Files:

• include/ninput.h (modified) (1 diff)
• include/vlc_meta.h (modified) (1 diff)
• modules/demux/m3u.c (modified) (1 diff)
• modules/video_output/directx/events.c (modified) (1 diff)
• src/input/control.c (modified) (2 diffs)

include/ninput.h

@@ -390 +390 @@
-
-    INPUT_ADD_INFO,   /* arg1= char * arg2= char * arg3=...  res=can fail    */
+    INPUT_GET_INFO,   /* arg1= char * arg2= char * arg3= char ** res=can fail*/
-
-    INPUT_SET_NAME,   /* arg1= char * res=can fail    */

include/vlc_meta.h

@@ -133 +133 @@
-}
-
+static inline char *vlc_meta_GetValue( vlc_meta_t *m, char *name )
+{
+    int i;
+
+    for( i = 0; i < m->i_meta; i++ )
+    {
+        if( !strcmp( m->name[i], name ) )
+        {
+            char *value = NULL;
+            if( m->value[i] ) value = strdup( m->value[i] );
+            return value;
+        }
+    }
+    return NULL;
+}
+
-#endif

modules/demux/m3u.c

@@ -36 +36 @@
- * Constants and structures
- *****************************************************************************/
-1024
+8192
-
-#define TYPE_UNKNOWN 0

modules/video_output/directx/events.c

@@ -31 +31 @@
-#include <ctype.h>                                              /* tolower() */
-#include <string.h>                                            /* strerror() */
+
+#ifndef _WIN32_WINNT
+#   define _WIN32_WINNT 0x0400
+#endif
-
-#include <vlc/vlc.h>

src/input/control.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-: stream.c 7041 2004-03-11 16:48:27Z gbazin 
+
- *
- * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -213 +213 @@
-        break;
-
+        case INPUT_GET_INFO:
+        {
+            char *psz_cat = (char *)va_arg( args, char * );
+            char *psz_name = (char *)va_arg( args, char * );
+            char **ppsz_value = (char **)va_arg( args, char ** );
+            int i;
+
+            i_ret = VLC_EGENERIC;
+            *ppsz_value = NULL;
+
+            vlc_mutex_lock( &p_input->p_item->lock );
+            for( i = 0; i < p_input->p_item->i_categories; i++ )
+            {
+                if( !strcmp( p_input->p_item->pp_categories[i]->psz_name,
+                             psz_cat ) )
+                    break;
+            }
+
+            if( i != p_input->p_item->i_categories )
+            {
+                info_category_t *p_cat;
+                p_cat = p_input->p_item->pp_categories[i];
+
+                for( i = 0; i < p_cat->i_infos; i++ )
+                {
+                    if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+                    {
+                        if( p_cat->pp_infos[i]->psz_value )
+                        {
+                            *ppsz_value =strdup(p_cat->pp_infos[i]->psz_value);
+                            i_ret = VLC_SUCCESS;
+                        }
+                        break;
+                    }
+                }
+            }
+            vlc_mutex_unlock( &p_input->p_item->lock );
+        }
+        break;
+
-        case INPUT_ADD_BOOKMARK:
-            p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );