Attachment 1574 Details for Bug 9869 – amarok-1.4.0-libvisual02.patch

[patch] amarok-1.4.0-libvisual02.patch

amarok-1.4.0-libvisual02.patch (text/plain), 3.17 KB, created by Zerg on 2006-08-11 22:08:19 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Zerg

Created: 2006-08-11 22:08:19 MSD

Size: 3.17 KB

patch

obsolete

>--- amarok-1.4.1/amarok/configure.in.in~	2006-07-02 23:37:44 +0400
>+++ amarok-1.4.1/amarok/configure.in.in	2006-07-08 00:58:22 +0400
>@@ -617,7 +617,7 @@ if test "$with_libvisual" = "yes"; then
> 
>     if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
> 
>-        PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [build_libvisual="yes"], [build_libvisual="no"])
>+        PKG_CHECK_MODULES(LIBVISUAL, libvisual >= 0.2.0, [build_libvisual="yes"], [build_libvisual="no"])
> 
>         AC_SUBST(LIBVISUAL_LIBS)
>         AC_SUBST(LIBVISUAL_CFLAGS)
>--- amarok-1.4.1/amarok/src/vis/libvisual/libvisual.cpp~	2006-07-02 23:37:44 +0400
>+++ amarok-1.4.1/amarok/src/vis/libvisual/libvisual.cpp	2006-05-14 22:11:27 +0400
>@@ -40,7 +40,7 @@ main( int argc, char** argv )
>         }
>         #endif
> 
>-        const char *plugin = 0;
>+        const char *plugin = NULL;
> 
>         while( (plugin = visual_actor_get_next_by_name( plugin )) )
>             std::cout << plugin << '\n';
>@@ -87,7 +87,7 @@ main( int argc, char** argv )
>         FD_ZERO( &fds );
>         FD_SET( sockfd, &fds );
> 
>-        ::select( sockfd+1, &fds, 0, 0, &tv );
>+        ::select( sockfd+1, &fds, NULL, NULL, &tv );
> 
>         if( FD_ISSET( sockfd, &fds) ) {
>             //amaroK sent us some data
>@@ -253,7 +253,7 @@ namespace SDL
>                       visual_bin_switch_actor_by_name( Vis::bin, (char*)Vis::plugin );
>                     SDL::unlock();
> 
>-                    SDL_WM_SetCaption( Vis::plugin, 0 );
>+                    SDL_WM_SetCaption( Vis::plugin, NULL );
> 
>                     break;
> 
>@@ -331,7 +331,7 @@ namespace LibVisual
>         bin    = visual_bin_new ();
>         depth  = visual_video_depth_enum_from_value( 24 );
> 
>-        if( !plugin ) plugin = visual_actor_get_next_by_name( 0 );
>+        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 );
>@@ -343,7 +343,7 @@ namespace LibVisual
> 
>         if( visual_bin_set_video( bin, video ) ) exit( "Cannot set video" );
> 
>-        visual_bin_connect_by_names( bin, (char*)plugin, 0 );
>+        visual_bin_connect_by_names( bin, (char*)plugin, NULL );
> 
>         if( visual_bin_get_depth( bin ) == VISUAL_VIDEO_DEPTH_GL )
>         {
>--- amarok-1.4.1/amarok/src/vis/libvisual/libvisual.h~	2006-07-02 23:37:44 +0400
>+++ amarok-1.4.1/amarok/src/vis/libvisual/libvisual.h	2006-05-14 22:11:27 +0400
>@@ -20,7 +20,7 @@ extern "C"
> 
> namespace SDL
> {
>-    static SDL_Surface *screen = 0;
>+    static SDL_Surface *screen = NULL;
>     static SDL_Color    pal[256];
> 
>     static void init();
>@@ -62,7 +62,7 @@ namespace LibVisual
>     {
>         plugin = visual_actor_get_next_by_name( plugin );
> 
>-        if( plugin == 0 ) plugin = visual_actor_get_next_by_name( 0 );
>+        if( plugin == NULL ) plugin = visual_actor_get_next_by_name( NULL );
>     }
> 
>     static inline void
>@@ -70,7 +70,7 @@ namespace LibVisual
>     {
>         plugin = visual_actor_get_prev_by_name( plugin );
> 
>-        if( plugin == 0 ) plugin = visual_actor_get_prev_by_name( 0 );
>+        if( plugin == NULL ) plugin = visual_actor_get_prev_by_name( NULL );
>     }
> 
>     static inline void

Actions: View | Diff

Attachments on bug 9869: 1574 | 1601