Changeset 728


Ignore:
Timestamp:
01/19/12 15:08:38 (4 months ago)
Author:
shiretu
Message:

-- properly implemented HAS_PROTOCOL_RAWHTTPSTREAM guard define
-- updated CMakeLists.txt and removed HAS_PROTOCOL_RAWHTTPSTREAM and other unused defines

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/1.0/builders/cmake/CMakeLists.txt

    r690 r728  
    7171#ADD_DEFINITIONS(-DHAS_PROTOCOL_MMS) 
    7272ADD_DEFINITIONS(-DHAS_PROTOCOL_HLS) 
    73 ADD_DEFINITIONS(-DHAS_PROTOCOL_RAWHTTPSTREAM) 
     73#ADD_DEFINITIONS(-DHAS_PROTOCOL_RAWHTTPSTREAM) 
    7474ADD_DEFINITIONS(-DHAS_MEDIA_MP3) 
    7575ADD_DEFINITIONS(-DHAS_MEDIA_MP4) 
    7676ADD_DEFINITIONS(-DHAS_MEDIA_FLV) 
    77 ADD_DEFINITIONS(-DHAS_MEDIA_NSV) 
    78 ADD_DEFINITIONS(-DHAS_SYSLOG) 
     77#ADD_DEFINITIONS(-DHAS_MEDIA_NSV) 
     78#ADD_DEFINITIONS(-DHAS_SYSLOG) 
    7979IF($ENV{COMPILE_STATIC} MATCHES "1") 
    8080        MESSAGE(STATUS "Compile static") 

  • branches/1.0/sources/thelib/include/streaming/outnetrawstream.h

    r637 r728  
    1 /*  
     1/* 
    22 *  Copyright (c) 2010, 
    33 *  Gavriloaie Eugen-Andrei (shiretu@gmail.com) 
    4  *   
     4 * 
    55 *  This file is part of crtmpserver. 
    66 *  crtmpserver is free software: you can redistribute it and/or modify 
    … …  
    88 *  the Free Software Foundation, either version 3 of the License, or 
    99 *  (at your option) any later version. 
    10  *   
     10 * 
    1111 *  crtmpserver is distributed in the hope that it will be useful, 
    1212 *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 *  GNU General Public License for more details. 
    15  *   
     15 * 
    1616 *  You should have received a copy of the GNU General Public License 
    1717 *  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>. 
    1818 */ 
    1919 
     20#ifdef HAS_PROTOCOL_RAWHTTPSTREAM 
    2021#ifndef _OUTNETRAWSTREAM_H 
    2122#define _OUTNETRAWSTREAM_H 
    … …  
    5152 
    5253#endif  /* _OUTNETRAWSTREAM_H */ 
    53  
     54#endif /* HAS_PROTOCOL_RAWHTTPSTREAM */ 

  • branches/1.0/sources/thelib/src/streaming/outnetrawstream.cpp

    r642 r728  
    1 /*  
     1/* 
    22 *  Copyright (c) 2010, 
    33 *  Gavriloaie Eugen-Andrei (shiretu@gmail.com) 
    4  *   
     4 * 
    55 *  This file is part of crtmpserver. 
    66 *  crtmpserver is free software: you can redistribute it and/or modify 
    … …  
    88 *  the Free Software Foundation, either version 3 of the License, or 
    99 *  (at your option) any later version. 
    10  *   
     10 * 
    1111 *  crtmpserver is distributed in the hope that it will be useful, 
    1212 *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 *  GNU General Public License for more details. 
    15  *   
     15 * 
    1616 *  You should have received a copy of the GNU General Public License 
    1717 *  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>. 
    1818 */ 
    1919 
     20#ifdef HAS_PROTOCOL_RAWHTTPSTREAM 
    2021#include "streaming/outnetrawstream.h" 
    2122#include "streaming/streamstypes.h" 
    … …  
    9798        return true; 
    9899} 
     100#endif /* HAS_PROTOCOL_RAWHTTPSTREAM */ 

  • trunk/builders/cmake/CMakeLists.txt

    r722 r728  
    7171#ADD_DEFINITIONS(-DHAS_PROTOCOL_MMS) 
    7272ADD_DEFINITIONS(-DHAS_PROTOCOL_HLS) 
    73 ADD_DEFINITIONS(-DHAS_PROTOCOL_RAWHTTPSTREAM) 
     73#ADD_DEFINITIONS(-DHAS_PROTOCOL_RAWHTTPSTREAM) 
    7474ADD_DEFINITIONS(-DHAS_MEDIA_MP3) 
    7575ADD_DEFINITIONS(-DHAS_MEDIA_MP4) 
    7676ADD_DEFINITIONS(-DHAS_MEDIA_FLV) 
    77 ADD_DEFINITIONS(-DHAS_MEDIA_NSV) 
    78 ADD_DEFINITIONS(-DHAS_SYSLOG) 
     77#ADD_DEFINITIONS(-DHAS_MEDIA_NSV) 
     78#ADD_DEFINITIONS(-DHAS_SYSLOG) 
    7979IF($ENV{COMPILE_STATIC} MATCHES "1") 
    8080        MESSAGE(STATUS "Compile static") 

  • trunk/sources/thelib/include/streaming/outnetrawstream.h

    r637 r728  
    1 /*  
     1/* 
    22 *  Copyright (c) 2010, 
    33 *  Gavriloaie Eugen-Andrei (shiretu@gmail.com) 
    4  *   
     4 * 
    55 *  This file is part of crtmpserver. 
    66 *  crtmpserver is free software: you can redistribute it and/or modify 
    … …  
    88 *  the Free Software Foundation, either version 3 of the License, or 
    99 *  (at your option) any later version. 
    10  *   
     10 * 
    1111 *  crtmpserver is distributed in the hope that it will be useful, 
    1212 *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 *  GNU General Public License for more details. 
    15  *   
     15 * 
    1616 *  You should have received a copy of the GNU General Public License 
    1717 *  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>. 
    1818 */ 
    1919 
     20#ifdef HAS_PROTOCOL_RAWHTTPSTREAM 
    2021#ifndef _OUTNETRAWSTREAM_H 
    2122#define _OUTNETRAWSTREAM_H 
    … …  
    5152 
    5253#endif  /* _OUTNETRAWSTREAM_H */ 
    53  
     54#endif /* HAS_PROTOCOL_RAWHTTPSTREAM */ 

  • trunk/sources/thelib/src/streaming/outnetrawstream.cpp

    r642 r728  
    1 /*  
     1/* 
    22 *  Copyright (c) 2010, 
    33 *  Gavriloaie Eugen-Andrei (shiretu@gmail.com) 
    4  *   
     4 * 
    55 *  This file is part of crtmpserver. 
    66 *  crtmpserver is free software: you can redistribute it and/or modify 
    … …  
    88 *  the Free Software Foundation, either version 3 of the License, or 
    99 *  (at your option) any later version. 
    10  *   
     10 * 
    1111 *  crtmpserver is distributed in the hope that it will be useful, 
    1212 *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 *  GNU General Public License for more details. 
    15  *   
     15 * 
    1616 *  You should have received a copy of the GNU General Public License 
    1717 *  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>. 
    1818 */ 
    1919 
     20#ifdef HAS_PROTOCOL_RAWHTTPSTREAM 
    2021#include "streaming/outnetrawstream.h" 
    2122#include "streaming/streamstypes.h" 
    … …  
    9798        return true; 
    9899} 
     100#endif /* HAS_PROTOCOL_RAWHTTPSTREAM */ 
Note: See TracChangeset for help on using the changeset viewer.