/*****************************************************************************
* projectm: visualization module based on libprojectM
*****************************************************************************
- * Copyright (C) 2009 the VideoLAN team
+ * Copyright © 2009-2011 the VideoLAN team
* $Id$
*
* Authors: Rémi Duraffort <ivoire@videolan.org>
+ * Laurent Aimar
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
#include <vlc_aout.h>
#include <vlc_vout.h>
#include <vlc_vout_wrapper.h>
+#include <vlc_opengl.h>
#include <vlc_filter.h>
#include <vlc_rand.h>
#include <libprojectM/projectM.hpp>
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define HEIGHT_TEXT N_("Video height")
#define HEIGHT_LONGTEXT N_("The height of the video window, in pixels.")
+#define MESHX_TEXT N_("Mesh width")
+#define MESHX_LONGTEXT N_("The width of the mesh, in pixels.")
+
+#define MESHY_TEXT N_("Mesh height")
+#define MESHY_LONGTEXT N_("The height of the mesh, in pixels.")
+
+#define TEXTURE_TEXT N_("Texture size")
+#define TEXTURE_LONGTEXT N_("The size of the texture, in pixels.")
+
+#ifdef WIN32
+# define FONT_PATH "C:\\WINDOWS\\Fonts\\arial.ttf"
+# define FONT_PATH_MENU "C:\\WINDOWS\\Fonts\\arial.ttf"
+#else
+# define FONT_PATH "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
+# define FONT_PATH_MENU "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf"
+#endif
+
vlc_module_begin ()
set_shortname( N_("projectM"))
set_description( N_("libprojectM effect") )
add_loadfile( "projectm-config", "/usr/share/projectM/config.inp",
CONFIG_TEXT, CONFIG_LONGTEXT, true )
#else
- add_loadfile( "projectm-preset-path", "/usr/share/projectM/presets",
+#ifdef WIN32
+ add_directory( "projectm-preset-path", NULL,
+#else
+ add_directory( "projectm-preset-path", "/usr/share/projectM/presets",
+#endif
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
- add_font( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf",
+ add_loadfile( "projectm-title-font", FONT_PATH,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
- add_font( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf",
- MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
+ add_loadfile( "projectm-menu-font", FONT_PATH_MENU,
+ MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
#endif
add_integer( "projectm-width", 800, WIDTH_TEXT, WIDTH_LONGTEXT,
false )
add_integer( "projectm-height", 640, HEIGHT_TEXT, HEIGHT_LONGTEXT,
false )
+ add_integer( "projectm-meshx", 32, MESHX_TEXT, MESHX_LONGTEXT,
+ false )
+ add_integer( "projectm-meshy", 24, MESHY_TEXT, MESHY_LONGTEXT,
+ false )
+ add_integer( "projectm-texture-size", 1024, TEXTURE_TEXT, TEXTURE_LONGTEXT,
+ false )
add_shortcut( "projectm" )
set_callbacks( Open, Close )
vlc_module_end ()
vout_thread_t *p_vout;
vout_display_t *p_vd;
- /* libprojectM objects */
- projectM *p_projectm;
-#ifndef HAVE_PROJECTM2
- char *psz_config;
-#else
- char *psz_preset_path;
- char *psz_title_font;
- char *psz_menu_font;
-#endif
-
/* Window size */
int i_width;
int i_height;
vlc_mutex_t lock;
bool b_quit;
float *p_buffer;
- int i_buffer_size;
- int i_nb_samples;
+ unsigned i_buffer_size;
+ unsigned i_nb_samples;
};
/* Create the object for the thread */
vlc_sem_init( &p_sys->ready, 0 );
- p_sys->b_error = false;
- p_sys->b_quit = false;
- p_sys->i_width = var_InheritInteger( p_filter, "projectm-width" );
- p_sys->i_height = var_InheritInteger( p_filter, "projectm-height" );
- p_sys->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
-#ifndef HAVE_PROJECTM2
- p_sys->psz_config = var_InheritString( p_filter, "projectm-config" );
-#else
- p_sys->psz_preset_path = var_InheritString( p_filter, "projectm-preset-path" );
- p_sys->psz_title_font = var_InheritString( p_filter, "projectm-title-font" );
- p_sys->psz_menu_font = var_InheritString( p_filter, "projectm-menu-font" );
-#endif
+ p_sys->b_error = false;
+ p_sys->b_quit = false;
+ p_sys->i_width = var_InheritInteger( p_filter, "projectm-width" );
+ p_sys->i_height = var_InheritInteger( p_filter, "projectm-height" );
+ p_sys->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
vlc_mutex_init( &p_sys->lock );
- p_sys->p_buffer = NULL;
+ p_sys->p_buffer = NULL;
p_sys->i_buffer_size = 0;
- p_sys->i_nb_samples = 0;
+ p_sys->i_nb_samples = 0;
/* Create the thread */
if( vlc_clone( &p_sys->thread, Thread, p_filter, VLC_THREAD_PRIORITY_LOW ) )
*/
static void Close( vlc_object_t *p_this )
{
- filter_t *p_filter = (filter_t *)p_this;
+ filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
/* Stop the thread
vlc_sem_destroy( &p_sys->ready );
vlc_mutex_destroy( &p_sys->lock );
free( p_sys->p_buffer );
-#ifndef HAVE_PROJECTM2
- free( p_sys->psz_config );
-#else
- free( p_sys->psz_preset_path );
- free( p_sys->psz_title_font );
- free( p_sys->psz_menu_font );
-#endif
free( p_sys );
}
p_in_buf->i_nb_samples );
const float *p_src = (float*)p_in_buf->p_buffer;
- for( int i = 0; i < p_sys->i_nb_samples; i++ )
+ for( unsigned i = 0; i < p_sys->i_nb_samples; i++ )
{
float v = 0;
for( int j = 0; j < p_sys->i_channels; j++ )
static int VoutCallback( vlc_object_t *p_vout, char const *psz_name,
vlc_value_t oldv, vlc_value_t newv, void *p_data )
{
+ VLC_UNUSED( p_vout ); VLC_UNUSED( oldv );
vout_display_t *p_vd = (vout_display_t*)p_data;
if( !strcmp(psz_name, "fullscreen") )
*/
static void *Thread( void *p_data )
{
- filter_t *p_filter = (filter_t*)p_data;
+ filter_t *p_filter = (filter_t*)p_data;
filter_sys_t *p_sys = p_filter->p_sys;
- int cancel = vlc_savecancel();
+
video_format_t fmt;
- vout_opengl_t *gl;
- int i_last_width = 0;
- int i_last_height = 0;
+ vlc_gl_t *gl;
+ unsigned int i_last_width = 0;
+ unsigned int i_last_height = 0;
locale_t loc;
locale_t oldloc;
-#ifdef HAVE_PROJECTM2
+
+ projectM *p_projectm;
+#ifndef HAVE_PROJECTM2
+ char *psz_config;
+#else
+ char *psz_preset_path;
+ char *psz_title_font;
+ char *psz_menu_font;
projectM::Settings settings;
#endif
+ vlc_savecancel();
+
/* Create the openGL provider */
p_sys->p_vout =
(vout_thread_t *)vlc_object_create( p_filter, sizeof(vout_thread_t) );
if( !p_sys->p_vout )
goto error;
- vlc_object_attach( p_sys->p_vout, p_filter );
-
/* */
video_format_Init( &fmt, 0 );
video_format_Setup( &fmt, VLC_CODEC_RGB32,
gl = vout_GetDisplayOpengl( p_sys->p_vd );
if( !gl )
{
+ var_DelCallback( p_sys->p_vout, "fullscreen", VoutCallback, p_sys->p_vd );
vout_DeleteDisplay( p_sys->p_vd, NULL );
vlc_object_release( p_sys->p_vout );
goto error;
}
+ /* Work-around the projectM locale bug */
loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
oldloc = uselocale (loc);
+
/* Create the projectM object */
#ifndef HAVE_PROJECTM2
- p_sys->p_projectm = new projectM( p_sys->psz_config );
+ psz_config = var_InheritString( p_filter, "projectm-config" );
+ p_projectm = new projectM( psz_config );
+ free( psz_config );
#else
- settings.meshX = 32;
- settings.meshY = 24;
- settings.fps = 35;
- settings.textureSize = 1024;
- settings.windowWidth = p_sys->i_width;
- settings.windowHeight = p_sys->i_height;
- settings.presetURL = p_sys->psz_preset_path;
- settings.titleFontURL = p_sys->psz_title_font;
- settings.menuFontURL = p_sys->psz_menu_font;
- settings.smoothPresetDuration = 5;
- settings.presetDuration = 30;
- settings.beatSensitivity = 10;
- settings.aspectCorrection = 1;
- settings.easterEgg = 1;
- settings.shuffleEnabled = 1;
- p_sys->p_projectm = new projectM( settings );
+ psz_preset_path = var_InheritString( p_filter, "projectm-preset-path" );
+#ifdef WIN32
+ if ( psz_preset_path == NULL )
+ {
+ char *psz_data_path = config_GetDataDir( p_filter );
+ asprintf( &psz_preset_path, "%s" DIR_SEP "visualization", psz_data_path );
+ free( psz_data_path );
+ }
#endif
- p_sys->i_buffer_size = p_sys->p_projectm->pcm()->maxsamples;
+
+ psz_title_font = var_InheritString( p_filter, "projectm-title-font" );
+ psz_menu_font = var_InheritString( p_filter, "projectm-menu-font" );
+
+ settings.meshX = var_InheritInteger( p_filter, "projectm-meshx" );
+ settings.meshY = var_InheritInteger( p_filter, "projectm-meshy" );
+ settings.fps = 35;
+ settings.textureSize = var_InheritInteger( p_filter, "projectm-texture-size" );
+ settings.windowWidth = p_sys->i_width;
+ settings.windowHeight = p_sys->i_height;
+ settings.presetURL = psz_preset_path;
+ settings.titleFontURL = psz_title_font;
+ settings.menuFontURL = psz_menu_font;
+ settings.smoothPresetDuration = 5;
+ settings.presetDuration = 30;
+ settings.beatSensitivity = 10;
+ settings.aspectCorrection = 1;
+ settings.easterEgg = 1;
+ settings.shuffleEnabled = 1;
+
+ p_projectm = new projectM( settings );
+
+ free( psz_menu_font );
+ free( psz_title_font );
+ free( psz_preset_path );
+#endif /* HAVE_PROJECTM2 */
+
+ p_sys->i_buffer_size = p_projectm->pcm()->maxsamples;
p_sys->p_buffer = (float*)calloc( p_sys->i_buffer_size,
sizeof( float ) );
vlc_sem_post( &p_sys->ready );
/* Choose a preset randomly or projectM will always show the first one */
- p_sys->p_projectm->selectPreset( (unsigned)vlc_mrand48() % p_sys->p_projectm->getPlaylistSize() );
+ if ( p_projectm->getPlaylistSize() > 0 )
+ p_projectm->selectPreset( (unsigned)vlc_mrand48() % p_projectm->getPlaylistSize() );
/* */
for( ;; )
/* FIXME it is not perfect as we will have black bands */
vout_display_place_t place;
vout_display_PlacePicture( &place, &p_sys->p_vd->source, p_sys->p_vd->cfg, false );
- p_sys->p_projectm->projectM_resetGL( place.width, place.height );
+ p_projectm->projectM_resetGL( place.width, place.height );
i_last_width = p_sys->p_vd->cfg->display.width;
i_last_height = p_sys->p_vd->cfg->display.height;
vlc_mutex_lock( &p_sys->lock );
if( p_sys->i_nb_samples > 0 )
{
- p_sys->p_projectm->pcm()->addPCMfloat( p_sys->p_buffer,
- p_sys->i_nb_samples );
+ p_projectm->pcm()->addPCMfloat( p_sys->p_buffer,
+ p_sys->i_nb_samples );
p_sys->i_nb_samples = 0;
}
if( p_sys->b_quit )
{
vlc_mutex_unlock( &p_sys->lock );
- delete p_sys->p_projectm;
+ delete p_projectm;
+ var_DelCallback( p_sys->p_vout, "fullscreen", VoutCallback, p_sys->p_vd );
vout_DeleteDisplay( p_sys->p_vd, NULL );
vlc_object_release( p_sys->p_vout );
if (loc != (locale_t)0)
}
vlc_mutex_unlock( &p_sys->lock );
- p_sys->p_projectm->renderFrame();
+ p_projectm->renderFrame();
/* */
mwait( i_deadline );
- if( !vout_opengl_Lock(gl) )
+ if( !vlc_gl_Lock(gl) )
{
- vout_opengl_Swap( gl );
- vout_opengl_Unlock( gl );
+ vlc_gl_Swap( gl );
+ vlc_gl_Unlock( gl );
}
}
abort();
projects / vlc / blobdiff