Changeset 1312bc9ee83bb3962380e172b87d8711ff164c73

Show
Ignore:
Timestamp:
24/08/03 00:49:50 (5 years ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1061678990 +0000
git-parent:

[ee7dfec569032cdafd7f3191ac711cc712ae2e32]

git-author:
Laurent Aimar <fenrir@videolan.org> 1061678990 +0000
Message:
  • configure.ac : added --enable-goom and --with-goom-tree. Btw, I use a

special goom tree source as I was unable to use standard goom library.
(I will provide it once mmx/ppc included)

  • modules/visualization/Modules.am: added goom
  • include/vlc_block.h src/misc/block.c: introduce a new data block
    api (not yet tested, ported from my local new input work).
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r17f8ae6 r1312bc9  
    9191    include/variables.h \ 
    9292    include/video_output.h \ 
     93    include/vlc_block.h \ 
    9394    include/vlc_common.h \ 
    9495    include/vlc_config.h \ 
    …… 
    318319    src/misc/charset.c \ 
    319320    src/misc/mtime.c \ 
     321    src/misc/block.c \ 
    320322    src/misc/modules.c \ 
    321323    src/misc/threads.c \ 

  • configure.ac

    rf388eb5 r1312bc9  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.66 2003/08/23 12:59:31 hartman Exp $ 
     2dnl $Id: configure.ac,v 1.67 2003/08/23 22:49:50 fenrir Exp $ 
    33 
    44AC_INIT(vlc,0.6.3-cvs) 
    …… 
    28452845then 
    28462846    AX_ADD_PLUGINS([visual]) 
     2847fi 
     2848 
     2849dnl 
     2850dnl  goom visualization plugin 
     2851dnl 
     2852AC_ARG_ENABLE(goom, 
     2853[  --enable-goom         goom visualisation plugin (default disabled)]) 
     2854if test "${enable_goom}" = "yes" 
     2855then 
     2856  AC_ARG_WITH(goom-tree, 
     2857    [    --with-goom-tree=PATH goom tree for static linking (required)]) 
     2858 
     2859  dnl 
     2860  dnl test for --with-goom-tree 
     2861  dnl 
     2862  if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}";then 
     2863    AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) 
     2864    real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`" 
     2865    if test -z "${real_goom_tree}"; then 
     2866      dnl  The given directory can't be found 
     2867      AC_MSG_RESULT(no) 
     2868      AC_MSG_ERROR([cannot cd to ${with_goom_tree}]) 
     2869    fi 
     2870    if test -f "${real_goom_tree}/libgoom.a"; then 
     2871      AC_MSG_RESULT(${real_goom_tree}/libgoom.a) 
     2872      AX_ADD_BUILTINS([goom]) 
     2873      AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) 
     2874      AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}]) 
     2875    else 
     2876      dnl  The given libgoom wasn't built 
     2877      AC_MSG_RESULT(no) 
     2878      AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}]) 
     2879    fi 
     2880  else 
     2881    dnl  The --with-goom-tree isn't specified wasn't built 
     2882    AC_MSG_RESULT(no) 
     2883    AC_MSG_ERROR([You have to specify a tree with --with-goom-tree]) 
     2884  fi 
    28472885fi 
    28482886 

  • include/vlc_common.h

    r186e68f r1312bc9  
    44 ***************************************************************************** 
    55 * Copyright (C) 1998, 1999, 2000 VideoLAN 
    6  * $Id: vlc_common.h,v 1.74 2003/08/17 23:02:51 fenrir Exp $ 
     6 * $Id: vlc_common.h,v 1.75 2003/08/23 22:49:50 fenrir Exp $ 
    77 * 
    88 * Authors: Samuel Hocevar <sam@via.ecp.fr> 
    …… 
    279279typedef struct network_socket_t network_socket_t; 
    280280typedef struct iso639_lang_t iso639_lang_t; 
     281 
     282/* block */ 
     283typedef struct block_t      block_t; 
     284typedef struct block_fifo_t block_fifo_t; 
    281285 
    282286/***************************************************************************** 

  • modules/visualization/Modules.am

    rfe17002 r1312bc9  
     1SOURCES_goom = goom.c 

  • modules/visualization/goom.c

    rcb2a5e4 r1312bc9  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: goom.c,v 1.1 2003/08/23 17:23:45 fenrir Exp $ 
     5 * $Id: goom.c,v 1.2 2003/08/23 22:49:50 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar 
    …… 
    3535#include "aout_internal.h" 
    3636 
    37 #include "goom/goom_core.h" 
     37#include "goom_core.h" 
    3838 
    3939#define GOOM_WIDTH 160 

  • src/misc/modules.c

    r504329b r1312bc9  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001 VideoLAN 
    5  * $Id: modules.c,v 1.129 2003/08/23 14:14:01 hartman Exp $ 
     5 * $Id: modules.c,v 1.130 2003/08/23 22:49:50 fenrir Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    9494#include "charset.h" 
    9595 
     96#include "vlc_block.h" 
     97 
    9698#if defined( UNDER_CE ) 
    9799#   define MYCHAR wchar_t