Todo update

diff --git a/TODO b/TODO
index f751e4ca4f19ea8a72ab543d58b9c0efd271fc07..e33f39c76672ffd0a5a9976579d47b6e1aca364a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -68,7 +68,7 @@ Urgency: Normal
 Platform: any\r
 Description: Dual window in embed mode\r
 Windows taskbar reports two windows in the video embed mode.\r
-Status: Assigned to gibalou\r
+Status: Done\r
 \r
 Task\r
 Difficulty: Guru\r
@@ -93,7 +93,7 @@ Urgency: Wishlist
 Platform: any\r
 Description: Full blown OSD system \r
  In the line of freevo etc.\r
-Status: Todo\r
+Status: Assigned to thedj, jpsaman and yoann\r
 \r
 Task\r
 Difficulty: Medium\r
@@ -127,7 +127,6 @@ Todo:<br />
    - **  Fix MP4, LIVE.COM<br />\r
 - *** Implement in MacOS X and Skins 2 interfaces<br />\r
 - wx implementation :<br />\r
-   - **  Add Directory<br />\r
    - **  Support item move/copy<br />\r
    - *   Explorer view<br />\r
    - *** Fix search<br />\r
@@ -236,6 +235,16 @@ Description: IceCast/ShoutCast serving
 This would be a nice thing for the sake of completeness of VLC's streaming capabilities.\r
 Status: Todo\r
 \r
+Task\r
+Difficulty: Hard\r
+Urgency: Normal\r
+Platform: Any\r
+Description: Rework of the preferences\r
+ * New information in preferences for a rework of how preferences are sorted in interfaces\r
+ * New widget types\r
+ See http://www.via.ecp.fr/via/ml/vlc-devel/200409/msg00409.html\r
+Status: Assigned to zorglub\r
+\r
 Task\r
 Difficulty: Hard\r
 Urgency: Normal\r
@@ -270,10 +279,8 @@ Difficulty: Hard
 Urgency: Normal\r
 Platform: any\r
 Description: Stream text subtitles\r
- Find a a way to stream text subtitles, in TS and in RTP.\r
-  - Find an existing norm\r
-  - Implement it\r
-<br />Needs testing and validating\r
+ Find a a way to stream text subtitles, in TS and in RTP.<br />\r
+ Needs testing and validating\r
 Status: 65% (fenrir)\r
 \r
 Task\r

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 44423036b000563bce6778c1fe6983fbfb902115..95e1fa6af7c966cfdb80dddf073b6d9044880f60 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -94,7 +94,11 @@ static int SendEvents( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define EFFECT_TEXT N_("Effect")
+#define SPEED_TEXT N_( "OpenGL cube rotation speed" )
+#define SPEED_LONGTEXT N_( "If the OpenGL cube effect is enabled, this " \
+                           "controls its rotation speed." )
+
+#define EFFECT_TEXT N_("Select effect")
 #define EFFECT_LONGTEXT N_( \
     "Allows you to select different visual effects.")
 
@@ -111,8 +115,9 @@ vlc_module_begin();
     set_capability( "video output", 20 );
 #endif
     add_shortcut( "opengl" );
+    add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT,
+                    SPEED_LONGTEXT, VLC_FALSE );
     set_callbacks( CreateVout, DestroyVout );
-
     add_string( "opengl-effect", "none", NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, VLC_TRUE );
         change_string_list( ppsz_effects, ppsz_effects_text, 0 );
@@ -135,6 +140,8 @@ struct vout_sys_t
     GLuint      p_textures[2];
 
     int         i_effect;
+
+    float       f_speed;
 };
 
 /*****************************************************************************
@@ -196,6 +203,8 @@ static int CreateVout( vlc_object_t *p_this )
         return VLC_ENOOBJ;
     }
 
+    p_sys->f_speed = var_CreateGetFloat( p_vout, "opengl-cube-speed" );
+
     p_vout->pf_init = Init;
     p_vout->pf_end = End;
     p_vout->pf_manage = Manage;
@@ -495,7 +504,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     }
     else
     {
-        glRotatef( 1.0, 0.3, 0.5, 0.7 );
+        glRotatef( 0.5 * p_sys->f_speed , 0.3, 0.5, 0.7 );
 
         glEnable( VLCGL_TARGET );
         glBegin( GL_QUADS );