Unified · Split
| @@ -675,22 +675,26 @@ public: · 674 unmodified lines | |||
| 675 | struct ObjectApi | 675 | struct ObjectApi |
| 676 | { | 676 | { |
| 677 | ObjectApi(); | 677 | ObjectApi(); |
| 678 | private: | 678 | |
| 679 | // 1.4.2.1 (nshaheed and ge and anonymous pr-lab member) | changed from private to public | ||
| 680 | // also changed all std::string & in this section to const char * | ||
| 681 | // intent: this allows for chugins to access member variables and create chuck strings | ||
| 682 | public: | ||
| 679 | // function pointer get_type() | 683 | // function pointer get_type() |
| 680 | Type (* const get_type)( CK_DL_API, Chuck_VM_Shred *, std::string &name ); | 684 | Type (* const get_type)( CK_DL_API, Chuck_VM_Shred *, const char * name ); |
| 681 | // function pointer create() | 685 | // function pointer create() |
| 682 | Object (* const create)( CK_DL_API, Chuck_VM_Shred *, Type type ); | 686 | Object (* const create)( CK_DL_API, Chuck_VM_Shred *, Type type ); |
| 683 | // function pointer create_string() | 687 | // function pointer create_string() |
| 684 | String (* const create_string)( CK_DL_API, Chuck_VM_Shred *, std::string &value ); | 688 | String (* const create_string)( CK_DL_API, Chuck_VM_Shred *, const char * value ); |
| 685 | // function pointers for get_mvar_*() | 689 | // function pointers for get_mvar_*() |
| 686 | t_CKBOOL (* const get_mvar_int)( CK_DL_API, Object object, std::string &name, t_CKINT &value ); | 690 | t_CKBOOL (* const get_mvar_int)( CK_DL_API, Object object, const char * name, t_CKINT & value ); |
| 687 | t_CKBOOL (* const get_mvar_float)( CK_DL_API, Object object, std::string &name, t_CKFLOAT &value ); | 691 | t_CKBOOL (* const get_mvar_float)( CK_DL_API, Object object, const char * name, t_CKFLOAT & value ); |
| 688 | t_CKBOOL (* const get_mvar_dur)( CK_DL_API, Object object, std::string &name, t_CKDUR &value ); | 692 | t_CKBOOL (* const get_mvar_dur)( CK_DL_API, Object object, const char * name, t_CKDUR & value ); |
| 689 | t_CKBOOL (* const get_mvar_time)( CK_DL_API, Object object, std::string &name, t_CKTIME &value ); | 693 | t_CKBOOL (* const get_mvar_time)( CK_DL_API, Object object, const char * name, t_CKTIME & value ); |
| 690 | t_CKBOOL (* const get_mvar_string)( CK_DL_API, Object object, std::string &name, String &value ); | 694 | t_CKBOOL (* const get_mvar_string)( CK_DL_API, Object object, const char * name, String & value ); |
| 691 | t_CKBOOL (* const get_mvar_object)( CK_DL_API, Object object, std::string &name, Object &value ); | 695 | t_CKBOOL (* const get_mvar_object)( CK_DL_API, Object object, const char * name, Object & value ); |
| 692 | // function pointer for set_string() | 696 | // function pointer for set_string() |
| 693 | t_CKBOOL (* const set_string)( CK_DL_API, String string, std::string &value ); | 697 | t_CKBOOL (* const set_string)( CK_DL_API, String string, const char * value ); |
| 694 | } * const object; | 698 | } * const object; |
| 695 | 699 | ||
| 696 | Api() : | 700 | Api() : |