2011/10/30 11:54:46

diff --git a/nlib/nlib.h b/nlib/nlib.h
index 2153a3d..f608b2d 100644 (file)
--- a/nlib/nlib.h
+++ b/nlib/nlib.h
@@ -219,13 +219,13 @@ extern "C" {
        ///
        ///\90Ú\91±\8e\9e\82Ì\8eó\90M\82·\82é\83R\83\81\83\93\83g\90\94\82ð\90Ý\92è
        ///
-       NLIB_DECLSPEC VOID SetResFrom(INT_PTR res);
+       NLIB_DECLSPEC VOID NicoLiveStrream_setResFrom(NicoLiveStream_P self,INT_PTR res);
 
 
        ///
        ///\90Ú\91±\8e\9e\82Ì\8eó\90M\82·\82é\83R\83\81\83\93\83g\90\94\82ð\8eæ\93¾
        ///
-       NLIB_DECLSPEC INT_PTR GetResFrom();
+       NLIB_DECLSPEC INT_PTR NicoLiveStream_getResFrom(NicoLiveStream_P self);
 
        ///
        ///\83n\81[\83g\83r\81[\83g\82Ì\8aÔ\8au\82ð\90Ý\92è\81i\83~\83\8a\95b)

diff --git a/nlib/nlib_nicoLive.c b/nlib/nlib_nicoLive.c
index 6068e8e..6029fb3 100644 (file)
--- a/nlib/nlib_nicoLive.c
+++ b/nlib/nlib_nicoLive.c
@@ -10,7 +10,6 @@
 
 static XML_Parser xmlParser;
 static CRITICAL_SECTION playerStatusParserCs;
-static INT_PTR res_from = 0;
 
 static NicoLiveHeartBeatContainer heartBeatContainer;
 static CRITICAL_SECTION heartBeatCs;
@@ -414,15 +413,17 @@ BOOL NicoLiveStream_getKeapALiveFlag(NicoLiveStream_P self){
 
 }
 
-VOID SetResFrom(INT_PTR res){
+VOID NicoLiveStrream_setResFrom(NicoLiveStream_P self,INT_PTR res){
 
-       res_from = (-1) * res;
+
+
+       self->res_from = (res < 0 || res > 1000) ? 0 : ((-1) * res);
 
 }
 
-INT_PTR GetResFrom(){
+INT_PTR NicoLiveStream_getResFrom(NicoLiveStream_P self){
 
-       return (-1) * res_from;
+       return (-1) * self->res_from;
 }
 
 NLIB_RESULT NicoLiveStream_connect(NicoLiveStream_P self,NicoVideoAuth_P nicoVideoAuth,LPCWSTR url,NicoRecvCallBack callback,LPVOID option){
@@ -528,13 +529,10 @@ NLIB_RESULT NicoLiveStream_connect(NicoLiveStream_P self,NicoVideoAuth_P nicoVid
                goto end;
        }
 
-       if(res_from > 0 || res_from < -1000 ){
 
-               res_from = 0;
-       }
 
        //\90¶\95ú\91\97\83I\83u\83W\83F\83N\83g\82É\8ae\88ø\90\94\82ð\90Ý\92è
-       self->res_from = res_from;
+
        self->callBack = callback;
        self->option = option;
 

diff --git a/nlib/nlib_nicoLive.h b/nlib/nlib_nicoLive.h
index c6b073a..9a4ea1a 100644 (file)
--- a/nlib/nlib_nicoLive.h
+++ b/nlib/nlib_nicoLive.h
@@ -33,7 +33,7 @@ typedef struct {
 
 typedef struct streamstatus_t{
 //     WCHAR description[LENGTH_NICOLIVEDESCRIPTION];
-       WCHAR title[LENGTH_NICOLIVETITLE];
+//     WCHAR title[LENGTH_NICOLIVETITLE];
        WCHAR id[LENGTH_NICOLIVEID];
        WCHAR default_community[LENGTH_128];
        PROVIDERTYPE provider_type;

diff --git a/nlib/nlib_xmlHandler.c b/nlib/nlib_xmlHandler.c
index e09d851..16da6ef 100644 (file)
--- a/nlib/nlib_xmlHandler.c
+++ b/nlib/nlib_xmlHandler.c
@@ -15,7 +15,6 @@ enum NPlayerStatus_NORD{
        NPlayerStatus_ID,
        NPlayerStatus_CODE,
        NPlayerStatus_PORT,
-       NPlayerStatus_TITLE,
        NPlayerStatus_PROVIDER,
        NPlayerStatus_DEFAULT_COMMUNITY,
        NPlayerStatus_IS_OWNER,
@@ -177,10 +176,6 @@ extern void NPlayerStatus_ElementStartHandler(void *userData,const XML_Char *psz
 
                        element = NPlayerStatus_ID;
 
-               } else if(_tcscmp(pszName,TEXT("title")) == 0){
-
-                       element = NPlayerStatus_TITLE;
-
                } else if(_tcscmp(pszName,TEXT("provider_type")) == 0){
 
                        element = NPlayerStatus_PROVIDER;
@@ -320,13 +315,7 @@ void NPlayerStatus_CharacterDataHandler(void *userData,const XML_Char *pszData,i
 
                break;
                
-               //getplayerstatus/stream/title
-       case MAKENORD2(NPlayerStatus_GETPLAYERSTATUS,NPlayerStatus_STREAM,NPlayerStatus_TITLE):
 
-               
-               ps->error =  StrCpyArray(ps->stream.title,pszData,nLength);
-
-               break;
 
                //getplayerstatus/user/is_premium
        case MAKENORD2(NPlayerStatus_GETPLAYERSTATUS,NPlayerStatus_USER,NPlayerStatus_IS_PREMIUM):

diff --git a/nlib_driver/nlib_driver.cpp b/nlib_driver/nlib_driver.cpp
index 52dd688..e353933 100644 (file)
--- a/nlib_driver/nlib_driver.cpp
+++ b/nlib_driver/nlib_driver.cpp
@@ -177,7 +177,7 @@ void nicoLive_connect(void) {
 
        
 
-       SetResFrom(1000);
+       NicoLiveStrream_setResFrom(nl,1000);
        NicoLiveStream_setHeartBeatMsec(nl,5000);
        NicoLiveStream_setKeapALiveMsec(nl,5000);
        //NicoLiveStream_setKeapALiveFlag(nl,FALSE);