Attachment #1574 for bug #9869

View | Details | Raw Unified | Return to bug 9869
Collapse All | Expand All

Lines 617-623 if test "$with_libvisual" = "yes"; then Link Here

(-)amarok-1.4.1/amarok/configure.in.in~ (-1 / +1 lines)
617		617
618	if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then	618	if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
619		619
620	PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [build_libvisual="yes"], [build_libvisual="no"])	620	PKG_CHECK_MODULES(LIBVISUAL, libvisual >= 0.2.0, [build_libvisual="yes"], [build_libvisual="no"])
621		621
622	AC_SUBST(LIBVISUAL_LIBS)	622	AC_SUBST(LIBVISUAL_LIBS)
623	AC_SUBST(LIBVISUAL_CFLAGS)	623	AC_SUBST(LIBVISUAL_CFLAGS)




        }
        #endif

        const char *plugin = NULL;

        while( (plugin = visual_actor_get_next_by_name( plugin )) )
            std::cout << plugin << '\n';

        FD_ZERO( &fds );
        FD_SET( sockfd, &fds );

        ::select( sockfd+1, &fds, NULL, NULL, &tv );

        if( FD_ISSET( sockfd, &fds) ) {
            //amaroK sent us some data

                      visual_bin_switch_actor_by_name( Vis::bin, (char*)Vis::plugin );
                    SDL::unlock();

                    SDL_WM_SetCaption( Vis::plugin, NULL );

                    break;


        bin    = visual_bin_new ();
        depth  = visual_video_depth_enum_from_value( 24 );

        if( !plugin ) plugin = visual_actor_get_next_by_name( NULL );
        if( !plugin ) exit( "Actor plugin not found!" );

        visual_bin_set_supported_depth( bin, VISUAL_VIDEO_DEPTH_ALL );


        if( visual_bin_set_video( bin, video ) ) exit( "Cannot set video" );

        visual_bin_connect_by_names( bin, (char*)plugin, NULL );

        if( visual_bin_get_depth( bin ) == VISUAL_VIDEO_DEPTH_GL )
        {





namespace SDL
{
    static SDL_Surface *screen = NULL;
    static SDL_Color    pal[256];

    static void init();

    {
        plugin = visual_actor_get_next_by_name( plugin );

        if( plugin == NULL ) plugin = visual_actor_get_next_by_name( NULL );
    }

    static inline void

    {
        plugin = visual_actor_get_prev_by_name( plugin );

        if( plugin == NULL ) plugin = visual_actor_get_prev_by_name( NULL );
    }

    static inline void

Return to bug 9869

Lines 40-46 main( int argc, char** argv ) Link Here

(-)amarok-1.4.1/amarok/src/vis/libvisual/libvisual.cpp~ (-5 / +5 lines)
40	}	40	}
41	#endif	41	#endif
42		42
43	const char *plugin = 0;	43	const char *plugin = NULL;
44		44
45	while( (plugin = visual_actor_get_next_by_name( plugin )) )	45	while( (plugin = visual_actor_get_next_by_name( plugin )) )
46	std::cout << plugin << '\n';	46	std::cout << plugin << '\n';
Lines 87-93 main( int argc, char** argv ) Link Here
87	FD_ZERO( &fds );	87	FD_ZERO( &fds );
88	FD_SET( sockfd, &fds );	88	FD_SET( sockfd, &fds );
89		89
90	::select( sockfd+1, &fds, 0, 0, &tv );	90	::select( sockfd+1, &fds, NULL, NULL, &tv );
91		91
92	if( FD_ISSET( sockfd, &fds) ) {	92	if( FD_ISSET( sockfd, &fds) ) {
93	//amaroK sent us some data	93	//amaroK sent us some data
Lines 253-259 namespace SDL Link Here
253	visual_bin_switch_actor_by_name( Vis::bin, (char*)Vis::plugin );	253	visual_bin_switch_actor_by_name( Vis::bin, (char*)Vis::plugin );
254	SDL::unlock();	254	SDL::unlock();
255		255
256	SDL_WM_SetCaption( Vis::plugin, 0 );	256	SDL_WM_SetCaption( Vis::plugin, NULL );
257		257
258	break;	258	break;
259		259
Lines 331-337 namespace LibVisual Link Here
331	bin = visual_bin_new ();	331	bin = visual_bin_new ();
332	depth = visual_video_depth_enum_from_value( 24 );	332	depth = visual_video_depth_enum_from_value( 24 );
333		333
334	if( !plugin ) plugin = visual_actor_get_next_by_name( 0 );	334	if( !plugin ) plugin = visual_actor_get_next_by_name( NULL );
335	if( !plugin ) exit( "Actor plugin not found!" );	335	if( !plugin ) exit( "Actor plugin not found!" );
336		336
337	visual_bin_set_supported_depth( bin, VISUAL_VIDEO_DEPTH_ALL );	337	visual_bin_set_supported_depth( bin, VISUAL_VIDEO_DEPTH_ALL );
Lines 343-349 namespace LibVisual Link Here
343		343
344	if( visual_bin_set_video( bin, video ) ) exit( "Cannot set video" );	344	if( visual_bin_set_video( bin, video ) ) exit( "Cannot set video" );
345		345
346	visual_bin_connect_by_names( bin, (char*)plugin, 0 );	346	visual_bin_connect_by_names( bin, (char*)plugin, NULL );
347		347
348	if( visual_bin_get_depth( bin ) == VISUAL_VIDEO_DEPTH_GL )	348	if( visual_bin_get_depth( bin ) == VISUAL_VIDEO_DEPTH_GL )
349	{	349	{

Lines 20-26 extern "C" Link Here

(-)amarok-1.4.1/amarok/src/vis/libvisual/libvisual.h~ (-3 / +3 lines)
20		20
21	namespace SDL	21	namespace SDL
22	{	22	{
23	static SDL_Surface *screen = 0;	23	static SDL_Surface *screen = NULL;
24	static SDL_Color pal[256];	24	static SDL_Color pal[256];
25		25
26	static void init();	26	static void init();
Lines 62-68 namespace LibVisual Link Here
62	{	62	{
63	plugin = visual_actor_get_next_by_name( plugin );	63	plugin = visual_actor_get_next_by_name( plugin );
64		64
65	if( plugin == 0 ) plugin = visual_actor_get_next_by_name( 0 );	65	if( plugin == NULL ) plugin = visual_actor_get_next_by_name( NULL );
66	}	66	}
67		67
68	static inline void	68	static inline void
Lines 70-76 namespace LibVisual Link Here
70	{	70	{
71	plugin = visual_actor_get_prev_by_name( plugin );	71	plugin = visual_actor_get_prev_by_name( plugin );
72		72
73	if( plugin == 0 ) plugin = visual_actor_get_prev_by_name( 0 );	73	if( plugin == NULL ) plugin = visual_actor_get_prev_by_name( NULL );
74	}	74	}
75		75
76	static inline void	76	static inline void