[MPlayer-cvslog] r25744 - in trunk: m_property.c m_property.h

13 Jan 2008

Author: reimar
Date: Sun Jan 13 17:59:21 2008
New Revision: 25744

Log:
All the m_property stuff works fine with constant m_option_t


Modified:
   trunk/m_property.c
   trunk/m_property.h

Modified: trunk/m_property.c
==============================================================================

--- trunk/m_property.c	(original)
+++ trunk/m_property.c	Sun Jan 13 17:59:21 2008
@@ -17,10 +17,10 @@
 
 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
 
-static int do_action(m_option_t* prop_list, const char* name,
+static int do_action(const m_option_t* prop_list, const char* name,
                      int action, void* arg, void *ctx) {
     const char* sep;
-    m_option_t* prop;
+    const m_option_t* prop;
     m_property_action_t ka;
     int r;
     if((sep = strchr(name,'/')) && sep[1]) {
@@ -40,15 +40,15 @@ static int do_action(m_option_t* prop_li
     r = ((m_property_ctrl_f)prop->p)(prop,action,arg,ctx);
     if(action == M_PROPERTY_GET_TYPE && r < 0) {
         if(!arg) return M_PROPERTY_ERROR;
-        *(m_option_t**)arg = prop;
+        *(const m_option_t**)arg = prop;
         return M_PROPERTY_OK;
     }
     return r;
 }
 
-int m_property_do(m_option_t* prop_list, const char* name,
+int m_property_do(const m_option_t* prop_list, const char* name,
                   int action, void* arg, void *ctx) {
-    m_option_t* opt;
+    const m_option_t* opt;
     void* val;
     char* str;
     int r;
@@ -97,7 +97,7 @@ int m_property_do(m_option_t* prop_list,
     return do_action(prop_list,name,action,arg,ctx);
 }
 
-char* m_properties_expand_string(m_option_t* prop_list,char* str, void *ctx) {
+char* m_properties_expand_string(const m_option_t* prop_list,char* str, void *ctx) {
     int l,fr=0,pos=0,size=strlen(str)+512;
     char *p = NULL,*e,*ret = malloc(size), num_val;
     int skip = 0, lvl = 0, skip_lvl = 0;
@@ -177,13 +177,13 @@ char* m_properties_expand_string(m_optio
     return ret;
 }
 
-void m_properties_print_help_list(m_option_t* list) {
+void m_properties_print_help_list(const m_option_t* list) {
     char min[50],max[50];
     int i,count = 0;
     
     mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_PropertyListHeader);
     for(i = 0 ; list[i].name ; i++) {
-        m_option_t* opt = &list[i];
+        const m_option_t* opt = &list[i];
         if(opt->flags & M_OPT_MIN)
             sprintf(min,"%-8.0f",opt->min);
         else
@@ -204,7 +204,7 @@ void m_properties_print_help_list(m_opti
 
 // Some generic property implementations
 
-int m_property_int_ro(m_option_t* prop,int action,
+int m_property_int_ro(const m_option_t* prop,int action,
                       void* arg,int var) {
     switch(action) {
     case M_PROPERTY_GET:
@@ -215,7 +215,7 @@ int m_property_int_ro(m_option_t* prop,i
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
-int m_property_int_range(m_option_t* prop,int action,
+int m_property_int_range(const m_option_t* prop,int action,
                          void* arg,int* var) {
     switch(action) {
     case M_PROPERTY_SET:
@@ -233,7 +233,7 @@ int m_property_int_range(m_option_t* pro
     return m_property_int_ro(prop,action,arg,*var);
 }
 
-int m_property_choice(m_option_t* prop,int action,
+int m_property_choice(const m_option_t* prop,int action,
                       void* arg,int* var) {
     switch(action) {
     case M_PROPERTY_STEP_UP:
@@ -245,7 +245,7 @@ int m_property_choice(m_option_t* prop,i
     return m_property_int_range(prop,action,arg,var);
 }
 
-int m_property_flag(m_option_t* prop,int action,
+int m_property_flag(const m_option_t* prop,int action,
                     void* arg,int* var) {
     switch(action) {
     case M_PROPERTY_STEP_UP:
@@ -260,7 +260,7 @@ int m_property_flag(m_option_t* prop,int
     return m_property_int_range(prop,action,arg,var);
 }
 
-int m_property_float_ro(m_option_t* prop,int action,
+int m_property_float_ro(const m_option_t* prop,int action,
                         void* arg,float var) {
     switch(action) {
     case M_PROPERTY_GET:
@@ -276,7 +276,7 @@ int m_property_float_ro(m_option_t* prop
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
-int m_property_float_range(m_option_t* prop,int action,
+int m_property_float_range(const m_option_t* prop,int action,
                            void* arg,float* var) {
     switch(action) {
     case M_PROPERTY_SET:
@@ -294,7 +294,7 @@ int m_property_float_range(m_option_t* p
     return m_property_float_ro(prop,action,arg,*var);
 }
 
-int m_property_delay(m_option_t* prop,int action,
+int m_property_delay(const m_option_t* prop,int action,
                      void* arg,float* var) {
     switch(action) {
     case M_PROPERTY_PRINT:
@@ -307,7 +307,7 @@ int m_property_delay(m_option_t* prop,in
     }
 }
 
-int m_property_double_ro(m_option_t* prop,int action,
+int m_property_double_ro(const m_option_t* prop,int action,
                          void* arg,double var) {
     switch(action) {
     case M_PROPERTY_GET:
@@ -323,7 +323,7 @@ int m_property_double_ro(m_option_t* pro
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
-int m_property_time_ro(m_option_t* prop,int action,
+int m_property_time_ro(const m_option_t* prop,int action,
                        void* arg,double var) {
     switch(action) {
     case M_PROPERTY_PRINT:
@@ -348,7 +348,7 @@ int m_property_time_ro(m_option_t* prop,
     return m_property_double_ro(prop,action,arg,var);
 }
 
-int m_property_string_ro(m_option_t* prop,int action,void* arg,char* str) {
+int m_property_string_ro(const m_option_t* prop,int action,void* arg,char* str) {
     switch(action) {
     case M_PROPERTY_GET:
         if(!arg) return 0;
@@ -362,7 +362,7 @@ int m_property_string_ro(m_option_t* pro
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
-int m_property_bitrate(m_option_t* prop,int action,void* arg,int rate) {
+int m_property_bitrate(const m_option_t* prop,int action,void* arg,int rate) {
     switch(action) {
     case M_PROPERTY_PRINT:
         if (!arg)

Modified: trunk/m_property.h
==============================================================================
--- trunk/m_property.h	(original)
+++ trunk/m_property.h	Sun Jan 13 17:59:21 2008
@@ -106,7 +106,7 @@ typedef struct {
 
 /// \ingroup Properties
 /// \brief Property action callback.
-typedef int(*m_property_ctrl_f)(m_option_t* prop,int action,void* arg,void *ctx);
+typedef int(*m_property_ctrl_f)(const m_option_t* prop,int action,void* arg,void *ctx);
 
 /// Do an action on a property.
 /** \param prop_list The list of properties.
@@ -115,11 +115,11 @@ typedef int(*m_property_ctrl_f)(m_option
  *  \param arg Argument, usually a pointer to the data type used by the property.
  *  \return See \ref PropertyActionsReturn.
  */
-int m_property_do(m_option_t* prop_list, const char* prop,
+int m_property_do(const m_option_t* prop_list, const char* prop,
                   int action, void* arg, void *ctx);
 
 /// Print a list of properties.
-void m_properties_print_help_list(m_option_t* list);
+void m_properties_print_help_list(const m_option_t* list);
 
 /// Expand a property string.
 /** This function allows to print strings containing property values.
@@ -132,7 +132,7 @@ void m_properties_print_help_list(m_opti
  *  \param str The string to expand.
  *  \return The newly allocated expanded string.
  */
-char* m_properties_expand_string(m_option_t* prop_list,char* str, void *ctx);
+char* m_properties_expand_string(const m_option_t* prop_list,char* str, void *ctx);
 
 // Helpers to use MPlayer's properties
 
@@ -156,46 +156,46 @@ char* mp_property_print(const char *name
     } while(0)
 
 /// Implement get.
-int m_property_int_ro(m_option_t* prop,int action,
+int m_property_int_ro(const m_option_t* prop,int action,
                       void* arg,int var);
 
 /// Implement set, get and step up/down.
-int m_property_int_range(m_option_t* prop,int action,
+int m_property_int_range(const m_option_t* prop,int action,
                          void* arg,int* var);
 
 /// Same as m_property_int_range but cycle.
-int m_property_choice(m_option_t* prop,int action,
+int m_property_choice(const m_option_t* prop,int action,
                       void* arg,int* var);
 
 /// Switch betwen min and max.
-int m_property_flag(m_option_t* prop,int action,
+int m_property_flag(const m_option_t* prop,int action,
                     void* arg,int* var);
 
 /// Implement get, print.
-int m_property_float_ro(m_option_t* prop,int action,
+int m_property_float_ro(const m_option_t* prop,int action,
                         void* arg,float var);
 
 /// Implement set, get and step up/down
-int m_property_float_range(m_option_t* prop,int action,
+int m_property_float_range(const m_option_t* prop,int action,
                            void* arg,float* var);
 
 /// float with a print function which print the time in ms
-int m_property_delay(m_option_t* prop,int action,
+int m_property_delay(const m_option_t* prop,int action,
                      void* arg,float* var);
 
 /// Implement get, print
-int m_property_double_ro(m_option_t* prop,int action,
+int m_property_double_ro(const m_option_t* prop,int action,
                          void* arg,double var);
 
 /// Implement print
-int m_property_time_ro(m_option_t* prop,int action,
+int m_property_time_ro(const m_option_t* prop,int action,
                        void* arg,double var);
 
 /// get/print the string
-int m_property_string_ro(m_option_t* prop,int action,void* arg, char* str);
+int m_property_string_ro(const m_option_t* prop,int action,void* arg, char* str);
 
 /// get/print a bitrate
-int m_property_bitrate(m_option_t* prop,int action,void* arg,int rate);
+int m_property_bitrate(const m_option_t* prop,int action,void* arg,int rate);
 
 ///@}

    