Changeset acf462d72a4c5ecf73aa9f70e6b6df569f6548e1

Timestamp:

12/16/06 00:21:27 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1166224887 +0000

git-parent:

[9a55e8384d5115113f5623b98d66660ae2a89972]

git-author:

Clément Stenac <zorglub@videolan.org> 1166224887 +0000

Message:

Rework dicts as macros for type-independance

Files:

• include/vlc_arrays.h (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/misc/dict.c (deleted)
• src/playlist/thread.c (modified) (1 diff)
• test/NativeLibvlcTest.py (modified) (1 diff)
• test/native/algo.c (modified) (3 diffs)
• test/native/i18n.c (modified) (1 diff)
• test/pyunit.h (modified) (1 diff)
• test/setup.py (modified) (1 diff)

include/vlc_arrays.h

@@ -148 +148 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/************************************************************************
@@ -174 +306 @@
-
-/* Internal functions */
-//printf("Realloc from %i to %i\n", array.i_alloc, newsize);
-#define _ARRAY_ALLOC(array, newsize) {                                      \
-    array.i_alloc = newsize;                                                \

src/Makefile.am

@@ -300 +300 @@
-    input/vlm.c \
-    misc/xml.c \
-    misc/dict.c \
-    misc/devices.c \
-    extras/libc.c \

src/playlist/thread.c

@@ -240 +240 @@
-    {
-        intf_InteractionDestroy( p_playlist->p_interaction );
-        fprintf( stderr, "NOW NULL ****\n" );
-        p_playlist->p_interaction = NULL;
-    }

test/NativeLibvlcTest.py

@@ -6 +6 @@
-    def test1Exception( self ):
-        """[LibVLC] Checks libvlc_exception"""
-
+#
-    def test2Startup( self ):
-        """[LibVLC] Checks creation/destroy of libvlc"""
-
+#
-    def test3Playlist( self ):
-        """[LibVLC] Checks basic playlist interaction"""
-
+#
-    def test4VLM( self ):
-        """[LibVLC] Checks VLM wrapper"""
-
+#

test/native/algo.c

@@ -173 +173 @@
- * Dictionnary
- *********************************************************************/
-
+
+
+
-{
-    int i = 0;
@@ -179 +181 @@
-    for( i = 0 ; i < p_dict->i_entries; i++ )
-    {
-p
+i
-                        i, p_dict->p_entries[i].i_hash,
-                        p_dict->p_entries[i].i_int,
-                        p_dict->p_entries[i].psz_string,
-p_
+
-    }
-    fprintf( stderr, "**** End Dump ****\n" );
@@ -191 +193 @@
-{
-    int i42 = 42,i40 = 40,i12 = 12, i0 = 0, i00 = 0;
-
-
+
+
+
+
+
+
-    ASSERT( p_dict->i_entries == 0, "" );
-    ASSERT( p_dict->p_entries == NULL, "" );
-
-vlc_DictInsert( p_dict, 0, NULL, (void*)(&i42)
+DICT_INSERT( p_dict, 0, NULL, i42
-    ASSERT( p_dict->i_entries == 1, "" );
-p_data == (void*)(&i42)
-
-vlc_DictInsert( p_dict, 1, "42", (void*)(&i42)
+data == i42
+
+DICT_INSERT( p_dict, 1, "42", i42
-    ASSERT( p_dict->i_entries == 2, "" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

test/native/i18n.c

@@ -22 +22 @@
-#include "../pyunit.h"
-#include <vlc/vlc.h>
-"charset.h"
+<vlc_charset.h>
-
-PyObject *i18n_atof_test( PyObject *self, PyObject *args )

test/pyunit.h

@@ -3 +3 @@
-extern int asserts;
-
-PyErr_SetString( PyExc_AssertionError, message
+fprintf( stderr, "Assert failed at %s:%i\n", __FILE__, __LINE__); PyErr_SetString( PyExc_AssertionError, message 
-
-#define DECLARE_MODULE( module ) PyMODINIT_FUNC init##module( void ) {  \

test/setup.py

@@ -45 +45 @@
-                'native/algo.c'],
-                include_dirs = ['../include', '../', '/usr/win32/include' ],
-
+, '../src/.libs/libvlc-control.so'
-                extra_compile_args = get_cflags(),
-                extra_link_args = [ '-L../..' ]  + get_ldflags(),