2012/01/25 1:49:53

diff --git a/nlib/nlib.h b/nlib/nlib.h
index 0ce7210..a875d8d 100644 (file)
--- a/nlib/nlib.h
+++ b/nlib/nlib.h
@@ -363,6 +363,12 @@ extern "C" {
        ///
        NLIB_DECLSPEC time_t StreamStatus_getBaseTime(StreamStatus_P self);
 
+
+       ///
+       ///\83X\83g\83\8a\81[\83\80\83X\83e\81[\83^\83X\82Ì\83^\83C\83g\83\8b\8eæ\93¾
+       ///
+       NLIB_DECLSPEC LPCTSTR StreamStatus_getTitle(StreamStatus_P self);
+
        //
        //\83j\83R\83j\83R\93®\89æ\94F\8fØ\8aÖ\98A\8aÖ\90\94
        /////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/nlib/nlib_define.h b/nlib/nlib_define.h
index 173227a..496255a 100644 (file)
--- a/nlib/nlib_define.h
+++ b/nlib/nlib_define.h
@@ -70,7 +70,7 @@
 #define NLIB_INITALIZE_FAILED_NETWORK                                                                                  ((NLIB_RESULT)2)
 
 ///\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ªNULL
-#define NLIB_LIVENO_IS_NULL                                                                                            ((NLIB_RESULT)3)
+#define NLIB_LIVENO_IS_NULL                                                                                                            ((NLIB_RESULT)3)
 
 ///\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ª\92·\82·\82¬\82é
 #define NLIB_LIVENO_FAILED_TOOBIG                                                                                              ((NLIB_RESULT)4)
@@ -175,6 +175,9 @@
 ///\83R\83\81\83\93\83g\91\97\90M\97p\82Ì\83|\83X\83g\83L\81[\8eæ\93¾\8e¸\94s
 #define NLIB_ERR_LIVE_GETPOSTKEY_FAILED                                                                                        ((NLIB_RESULT)36)
 
+///\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\8eæ\93¾\83G\83\89\81[:noauth\94­\90¶
+#define NLIB_ERR_GETPLAYERSTATUS_NOAUTH                                                                                        ((NLIB_RESULT)37)
+
 ///\83G\83\89\81[\83R\81[\83h\82ª\90Ý\92è\82³\82ê\82Ä\82¢\82È\82¢
 #define NLIB_ERR_CODE_NOTSET                                                                                                   ((NLIB_RESULT)0xFFFFFFFF)
 

diff --git a/nlib/nlib_errorMessage.cpp b/nlib/nlib_errorMessage.cpp
index f930602..3ca6cd7 100644 (file)
--- a/nlib/nlib_errorMessage.cpp
+++ b/nlib/nlib_errorMessage.cpp
@@ -119,6 +119,8 @@ DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_NOT_LIVECONNECT,TEXT("
 //NLIB_ERR_LIVE_GETPOSTKEY_FAILED
 DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_LIVE_GETPOSTKEY_FAILED,TEXT("\83R\83\81\83\93\83g\91\97\90M\97p\82Ì\83|\83X\83g\83L\81[\8eæ\93¾\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
+//NLIB_ERR_GETPLAYERSTATUS_NOAUTH
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_NOAUTH,TEXT("\95ú\91\97\90Ú\91±\82ª\8b\96\89Â\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_CODE_NOTSET
 DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_CODE_NOTSET,TEXT("\83G\83\89\81[\83R\81[\83h\82ª\90Ý\92è\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ\81B\83\89\83C\83u\83\89\83\8a\82Ì\8eÀ\91\95\82É\89½\82ç\82©\82Ì\96â\91è\82ª\82 \82é\82Ì\82Å\8aJ\94­\8eÒ\82É\95ñ\8d\90\82µ\82Ä\82­\82¾\82³\82¢"));
@@ -179,6 +181,7 @@ LPCTSTR NLIB_GetErrorMessage(NLIB_RESULT rsltCode){
                NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_NOT_LIVECONNECT)
                NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_LIVE_GETPOSTKEY_FAILED)
                NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_CODE_NOTSET)
+               NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_GETPLAYERSTATUS_NOAUTH)
        NLIB_ERRMESSAGE_TABLE_END()
        
 

diff --git a/nlib/nlib_nicoLive.cpp b/nlib/nlib_nicoLive.cpp
index 1ab7fd0..b9441b8 100644 (file)
--- a/nlib/nlib_nicoLive.cpp
+++ b/nlib/nlib_nicoLive.cpp
@@ -2108,3 +2108,11 @@ time_t StreamStatus_getBaseTime(StreamStatus_P self){
 }
 
 
+///
+///\83X\83g\83\8a\81[\83\80\83X\83e\81[\83^\83X\82Ì\83^\83C\83g\83\8b\8eæ\93¾
+///
+LPCTSTR StreamStatus_getTitle(StreamStatus_P self){
+
+       return self->title;
+}
+

diff --git a/nlib/nlib_nicoLive.h b/nlib/nlib_nicoLive.h
index cbf9cb1..107842b 100644 (file)
--- a/nlib/nlib_nicoLive.h
+++ b/nlib/nlib_nicoLive.h
@@ -64,7 +64,7 @@ typedef struct {
 ///\90¶\95ú\91\97\83X\83e\81[\83^\83X
 ///
 typedef struct streamstatus_t{
-
+       TCHAR title[LENGTH_256];
        TCHAR id[LENGTH_128];
        TCHAR default_community[LENGTH_128];
        PROVIDERTYPE provider_type;

diff --git a/nlib/nlib_xmlHandler.cpp b/nlib/nlib_xmlHandler.cpp
index 940686a..797b3dd 100644 (file)
--- a/nlib/nlib_xmlHandler.cpp
+++ b/nlib/nlib_xmlHandler.cpp
@@ -15,6 +15,7 @@ enum NPlayerStatus_NORD{
        NPlayerStatus_START_TIME,
        NPlayerStatus_ID,
        NPlayerStatus_CODE,
+       NPlayerStatus_TITLE,
        NPlayerStatus_PORT,
        NPlayerStatus_PROVIDER,
        NPlayerStatus_DEFAULT_COMMUNITY,
@@ -191,7 +192,10 @@ extern void NPlayerStatus_ElementStartHandler(void *userData,const XML_Char *psz
 
                        element = NPlayerStatus_ID;
 
-               } else if(_tcscmp(pszName,TEXT("provider_type")) == 0){
+               } else if(_tcscmp(pszName,TEXT("title")) == 0){
+               
+                       element = NPlayerStatus_TITLE;
+               }else if(_tcscmp(pszName,TEXT("provider_type")) == 0){
 
                        element = NPlayerStatus_PROVIDER;
 
@@ -320,6 +324,13 @@ void NPlayerStatus_CharacterDataHandler(void *userData,const XML_Char *pszData,i
                strToIntN(ps->stream.base_time,pszData,nLength);
 
                break;
+
+               //getplayerstatus/stream/title
+       case MAKENORD2(NPlayerStatus_GETPLAYERSTATUS,NPlayerStatus_STREAM,NPlayerStatus_TITLE):
+
+               StrCpy(ps->stream.title,ARRAY_LENGTH(ps->stream.title),pszData,nLength);
+
+               break;
                        
 
                //getplayerstatus/stream/id
@@ -483,6 +494,10 @@ void NPlayerStatus_CharacterDataHandler(void *userData,const XML_Char *pszData,i
 
                        ps->error = NLIB_ERR_GETPLAYERSTATUS_COMINGSOON;
 
+               }else if(_tcsncmp(pszData,TEXT("noauth"),nLength) == 0){
+
+                       ps->error = NLIB_ERR_GETPLAYERSTATUS_NOAUTH;
+
                } else {
 
                        errprint(TEXT("\96¢\92è\8b`\82Ì\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\8eæ\93¾\83G\83\89\81[:%s"),pszData);

diff --git a/nlite.suo b/nlite.suo
index 8ed4295..98f2de6 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index c1889b6..70fc0d3 100644 (file)
--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -278,6 +278,7 @@ BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){
        case NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE:
        case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT:
        case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED:
+       case NLIB_ERR_GETPLAYERSTATUS_NOAUTH:
 
                this->subLiveNoComboBox.AgreeInputLvNo();
                ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("\95ú\91\97\90Ú\91±\83G\83\89\81["),MB_ICONERROR | MB_OK);

diff --git a/nlite/nlite_nlib.cpp b/nlite/nlite_nlib.cpp
index 11be426..fbf1e52 100644 (file)
--- a/nlite/nlite_nlib.cpp
+++ b/nlite/nlite_nlib.cpp
@@ -27,7 +27,7 @@ VOID CStreamStatus::Initalize(){
 
 
 VOID CStreamStatus::SetStreamStatus(StreamStatus_P streamStatus){
-
+       title = StreamStatus_getTitle(streamStatus);
        id = StreamStatus_getId(streamStatus);
        default_community = StreamStatus_getDefaultCommunity(streamStatus);
        provider_type = StreamStatus_getProviderType(streamStatus);

diff --git a/nlite/nlite_nlib.h b/nlite/nlite_nlib.h
index 533276f..9d0708e 100644 (file)
--- a/nlite/nlite_nlib.h
+++ b/nlite/nlite_nlib.h
@@ -13,6 +13,7 @@ namespace nlite{
 
 
        public:
+               CNLiteString title;                                     //\95ú\91\97\83^\83C\83g\83\8b
                CNLiteString id;                                        //\95ú\91\97ID
                CNLiteString default_community;         //\83R\83~\83\85\83j\83e\83BID
                PROVIDERTYPE provider_type;                     //\95ú\91\97\82ª\83R\83~\83\85\83j\83e\83B\81E\83`\83\83\83\93\83l\83\8b\81E\8cö\8e®\82Ì\94»\92è