[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[548] mplayerxp/libplaytree

[<nic...@us...>]

Revision: 548
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=548&view=rev
Author:   nickols_k
Date:     2012-12-12 09:30:03 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
constantization

Modified Paths:
--------------
    mplayerxp/libplaytree/asxparser.cpp
    mplayerxp/libplaytree/asxparser.h

Modified: mplayerxp/libplaytree/asxparser.cpp
===================================================================
--- mplayerxp/libplaytree/asxparser.cpp	2012-12-12 09:07:39 UTC (rev 547)
+++ mplayerxp/libplaytree/asxparser.cpp	2012-12-12 09:30:03 UTC (rev 548)
@@ -99,7 +99,7 @@
 }
 
 void ASX_Parser::warning_attrib_invalid(char* elem, char* attrib,
-					const char** valid_vals,char* val)
+					const char** valid_vals,char* val) const
 {
     char *str,*vals;
     const char **ptr;
@@ -123,7 +123,7 @@
     delete str;
 }
 
-int ASX_Parser::get_yes_no_attrib(char* element, char* attrib,char** cattribs,int def) {
+int ASX_Parser::get_yes_no_attrib(char* element, char* attrib,char** cattribs,int def) const {
     char* val = asx_get_attrib(attrib,cattribs);
     const char* valids[] = { "NO", "YES", NULL };
     int r;
@@ -139,13 +139,13 @@
     return r;
 }
 
-void ASX_Parser::warning_attrib_required(const char *e, const char *a) { MSG_WARN("At line %d : element %s don't have the required attribute %s",line,e,a); }
-void ASX_Parser::warning_body_parse_error(const char *e) { MSG_WARN("At line %d : error while parsing %s body",line,e); }
+void ASX_Parser::warning_attrib_required(const char *e, const char *a) const { MSG_WARN("At line %d : element %s don't have the required attribute %s",line,e,a); }
+void ASX_Parser::warning_body_parse_error(const char *e) const { MSG_WARN("At line %d : error while parsing %s body",line,e); }
 
 ASX_Parser::ASX_Parser() {}
 ASX_Parser::~ASX_Parser() { if(ret_stack) delete ret_stack; }
 
-int ASX_Parser::parse_attribs(char* buffer,char*** _attribs) {
+int ASX_Parser::parse_attribs(char* buffer,char*** _attribs) const {
     char *ptr1, *ptr2, *ptr3;
     int n_attrib = 0;
     char **cattribs = NULL;
@@ -420,7 +420,7 @@
     return 1;
 }
 
-void ASX_Parser::param(char** cattribs, play_tree_t* pt) {
+void ASX_Parser::param(char** cattribs, play_tree_t* pt) const {
     const char *name,*val;
 
     name = asx_get_attrib("NAME",cattribs);
@@ -438,7 +438,7 @@
     play_tree_set_param(pt,name,val);
 }
 
-void ASX_Parser::ref(char** cattribs, play_tree_t* pt) {
+void ASX_Parser::ref(char** cattribs, play_tree_t* pt) const {
     char *href;
 
     href = asx_get_attrib("HREF",cattribs);
@@ -459,7 +459,7 @@
     delete href;
 }
 
-play_tree_t* ASX_Parser::entryref(libinput_t* libinput,char* buffer,char** _attribs) {
+play_tree_t* ASX_Parser::entryref(libinput_t* libinput,char* buffer,char** _attribs) const {
     play_tree_t* pt;
     char *href;
     Stream* stream;

Modified: mplayerxp/libplaytree/asxparser.h
===================================================================
--- mplayerxp/libplaytree/asxparser.h	2012-12-12 09:07:39 UTC (rev 547)
+++ mplayerxp/libplaytree/asxparser.h	2012-12-12 09:30:03 UTC (rev 548)
@@ -19,7 +19,7 @@
 
 	    static play_tree_t*	build_tree(libinput_t* libinput,const char* buffer, int ref);
 
-	    virtual int		parse_attribs(char* buffer,char*** _attribs);
+	    virtual int		parse_attribs(char* buffer,char*** _attribs) const;
 	    /*
 	     * Return -1 on error, 0 when nothing is found, 1 on sucess
 	     */
@@ -27,13 +27,13 @@
 	    int			get_line() const { return line; }
 	private:
 	    play_tree_t*	repeat(libinput_t*libinput,const char* buffer,char** _attribs);
-	    void		warning_attrib_invalid(char* elem, char* attrib,const char** valid_vals,char* val);
-	    void		warning_attrib_required(const char *e, const char *a);
-	    void		warning_body_parse_error(const char *e);
-	    int			get_yes_no_attrib(char* element, char* attrib,char** attribs,int def);
-	    void		param(char** attribs, play_tree_t* pt);
-	    void		ref(char** attribs, play_tree_t* pt);
-	    play_tree_t*	entryref(libinput_t* libinput,char* buffer,char** _attribs);
+	    void		warning_attrib_invalid(char* elem, char* attrib,const char** valid_vals,char* val) const;
+	    void		warning_attrib_required(const char *e, const char *a) const;
+	    void		warning_body_parse_error(const char *e) const;
+	    int			get_yes_no_attrib(char* element, char* attrib,char** attribs,int def) const;
+	    void		param(char** attribs, play_tree_t* pt) const;
+	    void		ref(char** attribs, play_tree_t* pt) const;
+	    play_tree_t*	entryref(libinput_t* libinput,char* buffer,char** _attribs) const;
 	    play_tree_t*	entry(const char* buffer,char** _attribs);
 
 	    int			line; // Curent line

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.