← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

Viewing changes to modules/visualization/galaktos/custom_shape.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-09-17 21:56:14 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20080917215614-tj0vx8xzd57e52t8
Tags: 0.9.2-1ubuntu1
https://launchpad.net/bugs/270404
https://launchpad.net/bugs/210354
https://launchpad.net/bugs/199870
https://launchpad.net/bugs/261567
* New Upstream Release, exception granted by
    - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404

Changes done in ubuntu:

* add libxul-dev to build-depends
* make sure that vlc is build against libxul in configure. This doesn't
  change anything in the package, but makes it more robust if building
  in an 'unclean' chroot or when modifying the package.
* debian/control: make Vcs-* fields point to the motumedia branch
* add libx264-dev and libass-dev to build-depends
  LP: #210354, #199870
* actually enable libass support by passing --enable-libass to configure
* enable libdca: add libdca-dev to build depends and --enable-libdca
* install the x264 plugin.

Changes already in the pkg-multimedia branch in debian:

* don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install  
* new upstream .desktop file now registers flash video mimetype LP: #261567
* add Xb-Npp-Applications to mozilla-plugin-vlc
* remove duplicate entries in debian/vlc-nox.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/visualization/galaktos/custom_shape.c
2
2
 * custom_shape.c:
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2004 the VideoLAN team
5
 
 * $Id: a038d670ac9e81577e7100f3b34daf2b42838d27 $
 
5
 * $Id$
6
6
 *
7
7
 * Authors: Cyril Deguet <asmax@videolan.org>
8
8
 *          code from projectM http://xmms-projectm.sourceforge.net
22
22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23
23
 *****************************************************************************/
24
24
 
25
 
//
26
 
 
27
 
 
28
25
#include <stdio.h>
29
 
#include <string.h>
30
26
#include <stdlib.h>
31
27
 
32
28
#include "common.h"
59
55
custom_shape_t * interface_shape = NULL;
60
56
int cwave_interface_id = 0;
61
57
extern preset_t * active_preset;
62
 
inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape);
 
58
static inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape);
63
59
void load_unspec_init_cond_shape(param_t * param);
64
60
 
65
61
void destroy_param_db_tree_shape(splaytree_t * tree);
523
519
  return custom_shape;
524
520
}
525
521
 
526
 
inline void evalCustomShapeInitConditions() {
 
522
void evalCustomShapeInitConditions() {
527
523
  splay_traverse(eval_custom_shape_init_conds, active_preset->custom_shape_tree);
528
524
 
529
525
}
530
526
 
531
 
inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape) {
 
527
static inline void eval_custom_shape_init_conds(custom_shape_t * custom_shape) {
532
528
  splay_traverse(eval_init_cond, custom_shape->init_cond_tree);
533
529
  splay_traverse(eval_init_cond, custom_shape->per_frame_init_eqn_tree);
534
530
}
592
588
 
593
589
/* Interface function. Makes another custom shape the current
594
590
   concern for per frame / point equations */
595
 
inline custom_shape_t * nextCustomShape() {
 
591
custom_shape_t * nextCustomShape() {
596
592
 
597
593
  if ((interface_shape = splay_find(&cwave_interface_id, active_preset->custom_shape_tree)) == NULL) {
598
594
    cwave_interface_id = 0;