mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-02 21:45:25 +00:00
Code Issues Projects Releases Wiki Activity

- removed all print outs noticed in xmms plugin

Browse Source 
- might have finally fixed start up bug by putting SDL_Init in root thread


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@513 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-10-05 01:57:24 +00:00
parent a31c0e1d05
commit 51160869a4
2 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/projectM-xmms/main.cpp
View File

@ -162,19 +162,18 @@ int worker_func(void*)
// SDL_TimerID title_timer = NULL;
std::string config_file;
config_file = read_config();
ConfigFile config(config_file);
int wvw = config.read<int>( "Window Width", 512 );
int wvh = config.read<int>( "Window Height", 512 );
int fullscreen = 0;
if (config.read("Fullscreen", true)) fullscreen = 1;
else fullscreen = 0;
init_display(wvw,wvh,&fvw,&fvh,fullscreen);
init_display(wvw,wvh,&fvw,&fvh,fullscreen);
SDL_WM_SetCaption("projectM v1.00", "projectM v1.00");
/** Initialise projectM */
globalPM = new projectM(config_file);
@ -264,10 +263,7 @@ int worker_func(void*)
// SDL_SemPost(sem);
}
printf("Worker thread: Exiting\n");
// if(title_timer)
// if(title_timer)
// SDL_RemoveTimer(title_timer);
delete globalPM;
@ -278,10 +274,21 @@ int worker_func(void*)
extern "C" void projectM_xmms_init(void)
{
printf("projectM plugin: Initializing\n");
// printf("projectM plugin: Initializing\n");
//SDL_EnableUNICODE(1);
SDL_EnableUNICODE(1);
/* First, initialize SDL's video subsystem. */
// std::cerr << "sdl init begin" << std::endl;
if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0 ) {
/* Failed, exit. */
fprintf( stderr, "Video initialization failed: %s\n",
SDL_GetError( ) );
//projectM_vtable.disable_plugin (&projectM_vtable);
return;
}
//std::cerr << "sdl init end" << std::endl;
sem = SDL_CreateSemaphore(1);
worker_thread = SDL_CreateThread ( *worker_func, NULL);
@ -295,13 +302,13 @@ extern "C" void projectM_cleanup(void)
SDL_SemWait(sem);
SDL_WaitThread(worker_thread, NULL);
// SDL_KillThread(worker_thread);
printf("killed thread\n");
//printf("killed thread\n");
SDL_DestroySemaphore(sem);
printf("Destroy Mutex\n");
//printf("Destroy Mutex\n");
SDL_Quit();
printf("projectM plugin: Cleanup completed\n");
// printf("projectM plugin: Cleanup completed\n");
}
extern "C" void projectM_about(void)
{
@ -350,7 +357,7 @@ std::string read_config()
strcpy(projectM_config, PROJECTM_PREFIX);
strcpy(projectM_config+strlen(PROJECTM_PREFIX), CONFIG_FILE);
projectM_config[strlen(PROJECTM_PREFIX)+strlen(CONFIG_FILE)]='\0';
printf("dir:%s \n",projectM_config);
//printf("dir:%s \n",projectM_config);
home=getenv("HOME");
strcpy(projectM_home, home);
strcpy(projectM_home+strlen(home), "/.projectM/config.inp");
@ -359,7 +366,7 @@ std::string read_config()
if ((in = fopen(projectM_home, "r")) != 0)
{
printf("reading ~/.projectM/config.inp \n");
//printf("reading ~/.projectM/config.inp \n");
fclose(in);
return std::string(projectM_home);
}
@ -408,15 +415,12 @@ std::string read_config()
fclose(in);
return std::string(projectM_config);}
else{ printf("Using implementation defaults, your system is really messed up, I'm suprised we even got this far\n"); abort();}
}
}
abort();
}
}
int frame = 1;
char dumpPath[128];

23
src/projectM-xmms/video_init.cpp
View File

@ -10,7 +10,7 @@
#include <GL/gl.h>
#include <GL/glu.h>
#include "video_init.h"
#include <iostream>
extern SDL_Surface *screen;
extern int texsize;
@ -41,15 +41,8 @@ void init_display(int w, int h, int *fvw, int *fvh, int f)
int bpp = 0;
/* Flags we will pass into SDL_SetVideoMode. */
int flags = 0;
/* First, initialize SDL's video subsystem. */
if( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0 ) {
/* Failed, exit. */
fprintf( stderr, "Video initialization failed: %s\n",
SDL_GetError( ) );
//projectM_vtable.disable_plugin (&projectM_vtable);
return;
}
/* Let's get some video information. */
info = SDL_GetVideoInfo( );
if( !info ) {
@ -60,12 +53,10 @@ void init_display(int w, int h, int *fvw, int *fvh, int f)
return;
}
printf("Screen Resolution: %d x %d\n", info->current_w, info->current_h);
// printf("Screen Resolution: %d x %d\n", info->current_w, info->current_h);
*fvw = info->current_w;
*fvh = info->current_h;
printf("set fvw and fvw\n");
bpp = info->vfmt->BitsPerPixel;
printf("set bpp\n");
//SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 8 );
//SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
//SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
@ -76,13 +67,10 @@ void init_display(int w, int h, int *fvw, int *fvh, int f)
SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, 8 );
SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
printf("set gl attributes\n");
if (f==0)
flags = SDL_OPENGL|SDL_HWSURFACE|SDL_RESIZABLE;
else flags = SDL_OPENGL|SDL_HWSURFACE|SDL_FULLSCREEN;
printf("set gl attributes2\n");
screen= SDL_SetVideoMode( w, h, bpp, flags ) ;
printf("set screen\n");
screen= SDL_SetVideoMode( w, h, bpp, flags ) ;
if(screen == 0 ) {
/*
* This could happen for a variety of reasons,
@ -97,7 +85,6 @@ void init_display(int w, int h, int *fvw, int *fvh, int f)
}
printf("video init done\n");
// setup_opengl(w,h);
//gluOrtho2D(0, w, 0, h);
}