Changeset 77


Ignore:
Timestamp:
08/16/10 22:09:59 (18 months ago)
Author:
shiretu
Message:

-- JNI fixes

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/builders/androidapplestreaming/src/com/rtmpd/CommandsInterface.java

    r75 r77  
    3535        public native HashMap<Object, Object> ContextCloseAll(); 
    3636 
    37         public native HashMap<Object, Object> CommandPlay(int contextId, String connectingString); 
     37        public native HashMap<Object, Object> CommandPlayCondensed(int contextId, String connectingString); 
    3838 
    3939        public native HashMap<Object, Object> CommandPlay(int contextId, String m3u8Uri, String httpSessionId, String keyPassword); 

  • trunk/builders/netbeans/osx/thelib/nbproject/Makefile-Debug.mk

    r56 r77  
    169169        ${OBJECTDIR}/_ext/1210522057/boxatom.o \ 
    170170        ${OBJECTDIR}/_ext/1124577818/inbounddnsresolverprotocol.o \ 
    171         ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o \ 
    172171        ${OBJECTDIR}/_ext/1210522057/atomstsd.o \ 
    173172        ${OBJECTDIR}/_ext/517913122/streamdescriptors.o \ 
    … …  
    891890        $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_RTP -DHAS_PROTOCOL_VAR -DHAS_PROTOCOL_LIVEFLV -DHAS_MEDIA_MP4 -DHAS_MEDIA_MP3 -DHAS_MEDIA_FLV -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1124577818/inbounddnsresolverprotocol.o ../../../../sources/thelib/src/protocols/dns/inbounddnsresolverprotocol.cpp 
    892891 
    893 ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o: ../../../../sources/thelib/src/thelibglobalcontext.cpp  
    894         ${MKDIR} -p ${OBJECTDIR}/_ext/794466240 
    895         ${RM} $@.d 
    896         $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_RTP -DHAS_PROTOCOL_VAR -DHAS_PROTOCOL_LIVEFLV -DHAS_MEDIA_MP4 -DHAS_MEDIA_MP3 -DHAS_MEDIA_FLV -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o ../../../../sources/thelib/src/thelibglobalcontext.cpp 
    897  
    898892${OBJECTDIR}/_ext/1210522057/atomstsd.o: ../../../../sources/thelib/src/mediaformats/mp4/atomstsd.cpp  
    899893        ${MKDIR} -p ${OBJECTDIR}/_ext/1210522057 

  • trunk/builders/netbeans/osx/thelib/nbproject/Makefile-Release.mk

    r56 r77  
    169169        ${OBJECTDIR}/_ext/1210522057/boxatom.o \ 
    170170        ${OBJECTDIR}/_ext/1124577818/inbounddnsresolverprotocol.o \ 
    171         ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o \ 
    172171        ${OBJECTDIR}/_ext/1210522057/atomstsd.o \ 
    173172        ${OBJECTDIR}/_ext/517913122/streamdescriptors.o \ 
    … …  
    891890        $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_RTP -DHAS_PROTOCOL_VAR -DHAS_PROTOCOL_LIVEFLV -DHAS_MEDIA_MP4 -DHAS_MEDIA_MP3 -DHAS_MEDIA_FLV -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1124577818/inbounddnsresolverprotocol.o ../../../../sources/thelib/src/protocols/dns/inbounddnsresolverprotocol.cpp 
    892891 
    893 ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o: ../../../../sources/thelib/src/thelibglobalcontext.cpp  
    894         ${MKDIR} -p ${OBJECTDIR}/_ext/794466240 
    895         ${RM} $@.d 
    896         $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_RTP -DHAS_PROTOCOL_VAR -DHAS_PROTOCOL_LIVEFLV -DHAS_MEDIA_MP4 -DHAS_MEDIA_MP3 -DHAS_MEDIA_FLV -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/794466240/thelibglobalcontext.o ../../../../sources/thelib/src/thelibglobalcontext.cpp 
    897  
    898892${OBJECTDIR}/_ext/1210522057/atomstsd.o: ../../../../sources/thelib/src/mediaformats/mp4/atomstsd.cpp  
    899893        ${MKDIR} -p ${OBJECTDIR}/_ext/1210522057 

  • trunk/builders/netbeans/osx/thelib/nbproject/configurations.xml

    r56 r77  
    453453        <itemPath>../../../../sources/thelib/src/streaming/streamsmanager.cpp</itemPath> 
    454454      </logicalFolder> 
    455       <itemPath>../../../../sources/thelib/src/thelibglobalcontext.cpp</itemPath> 
    456455    </logicalFolder> 
    457456    <logicalFolder name="ExternalFiles" 

  • trunk/sources/androidapplestreaming/src/jniwrapper.cpp

    r76 r77  
    5656} 
    5757 
    58 extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandPlay( 
     58extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandPlayCondensed( 
    5959                JNIEnv* pEnv, jobject thiz, jint contextId, jstring connectingString) { 
    6060        Variant result = CommandPlay( 
Note: See TracChangeset for help on using the changeset viewer.