Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-11-30 16:06:37 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b4057916b60716f7a2a19c5ab6f524a6a345eaec
b4057916
1 parent
efb73c54
add qt project file. fix cmake file for clion.
显示空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
241 行增加
和
2 行删除
trunk/CMakeLists.txt
trunk/src/app/srs_app_utility.cpp
trunk/src/qt/srs/srs-qt.pro
trunk/src/qt/srs/srs-qt.pro.user
trunk/src/srs/init → trunk/src/upp/init
trunk/src/srs/srs.upp → trunk/src/upp/srs.upp
trunk/CMakeLists.txt
查看文件 @
b405791
cmake_minimum_required
(
VERSION 2.6.4
)
project
(
srs CXX
)
INCLUDE_DIRECTORIES
(
objs objs/st objs/hp objs/openssl src/core src/kernel src/rtmp src/app
)
INCLUDE_DIRECTORIES
(
objs objs/st objs/hp objs/openssl
/include
src/core src/kernel src/rtmp src/app
)
set
(
SOURCE_FILES src/main/srs_main_server.cpp
)
AUX_SOURCE_DIRECTORY
(
src/core SOURCE_FILES
)
...
...
@@ -15,6 +15,7 @@ TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/st/libst.a)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/openssl/lib/libssl.a
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/openssl/lib/libcrypto.a
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/hp/libhttp_parser.a
)
TARGET_LINK_LIBRARIES
(
srs -ldl
)
IF
(
NOT EXISTS
${
PROJECT_SOURCE_DIR
}
/objs/st/libst.a
)
MESSAGE
(
"srs_libs not found"
)
...
...
trunk/src/app/srs_app_utility.cpp
查看文件 @
b405791
...
...
@@ -440,7 +440,7 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r)
unsigned
int
nb_current
=
0
;
unsigned
int
ticks
=
0
;
unsigned
int
aveq
=
0
;
memset
(
name
,
sizeof
(
name
),
0
);
memset
(
name
,
0
,
sizeof
(
name
)
);
sscanf
(
buf
,
"%4d %4d %31s %u %u %llu %u %u %u %llu %u %u %u %u"
,
&
major
,
...
...
trunk/src/qt/srs/srs-qt.pro
0 → 100644
查看文件 @
b405791
TEMPLATE
=
app
CONFIG
+=
console
CONFIG
-=
app_bundle
CONFIG
-=
qt
HEADERS
+=
\
..
/../
core
/*
.hpp \
../../kernel
/*
.hpp \
../../app
/*
.hpp \
../../rtmp
/*
.hpp
SOURCES += \
../../core
/*
.cpp \
../../kernel
/*
.cpp \
../../app
/*
.cpp \
../../rtmp
/*
.cpp \
../../main
/*
.cpp
INCLUDEPATH += \
../../core \
../../kernel \
../../app \
../../rtmp \
../../../objs \
../../../objs/st \
../../../objs/hp \
../../../objs/openssl/include
LIBS += \
../../../objs/st/libst.a \
../../../objs/hp/libhttp_parser.a \
../../../objs/openssl/lib/libssl.a \
../../../objs/openssl/lib/libcrypto.a \
-ldl
...
...
trunk/src/qt/srs/srs-qt.pro.user
0 → 100644
查看文件 @
b405791
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-11-30T15:48:20. -->
<qtcreator>
<data>
<variable>
ProjectExplorer.Project.ActiveTarget
</variable>
<value
type=
"int"
>
0
</value>
</data>
<data>
<variable>
ProjectExplorer.Project.EditorSettings
</variable>
<valuemap
type=
"QVariantMap"
>
<value
type=
"bool"
key=
"EditorConfiguration.AutoIndent"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.AutoSpacesForTabs"
>
false
</value>
<value
type=
"bool"
key=
"EditorConfiguration.CamelCaseNavigation"
>
true
</value>
<valuemap
type=
"QVariantMap"
key=
"EditorConfiguration.CodeStyle.0"
>
<value
type=
"QString"
key=
"language"
>
Cpp
</value>
<valuemap
type=
"QVariantMap"
key=
"value"
>
<value
type=
"QByteArray"
key=
"CurrentPreferences"
>
CppGlobal
</value>
</valuemap>
</valuemap>
<valuemap
type=
"QVariantMap"
key=
"EditorConfiguration.CodeStyle.1"
>
<value
type=
"QString"
key=
"language"
>
QmlJS
</value>
<valuemap
type=
"QVariantMap"
key=
"value"
>
<value
type=
"QByteArray"
key=
"CurrentPreferences"
>
QmlJSGlobal
</value>
</valuemap>
</valuemap>
<value
type=
"int"
key=
"EditorConfiguration.CodeStyle.Count"
>
2
</value>
<value
type=
"QByteArray"
key=
"EditorConfiguration.Codec"
>
UTF-8
</value>
<value
type=
"bool"
key=
"EditorConfiguration.ConstrainTooltips"
>
false
</value>
<value
type=
"int"
key=
"EditorConfiguration.IndentSize"
>
4
</value>
<value
type=
"bool"
key=
"EditorConfiguration.KeyboardTooltips"
>
false
</value>
<value
type=
"int"
key=
"EditorConfiguration.MarginColumn"
>
80
</value>
<value
type=
"bool"
key=
"EditorConfiguration.MouseHiding"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.MouseNavigation"
>
true
</value>
<value
type=
"int"
key=
"EditorConfiguration.PaddingMode"
>
1
</value>
<value
type=
"bool"
key=
"EditorConfiguration.ScrollWheelZooming"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.ShowMargin"
>
false
</value>
<value
type=
"int"
key=
"EditorConfiguration.SmartBackspaceBehavior"
>
0
</value>
<value
type=
"bool"
key=
"EditorConfiguration.SpacesForTabs"
>
true
</value>
<value
type=
"int"
key=
"EditorConfiguration.TabKeyBehavior"
>
0
</value>
<value
type=
"int"
key=
"EditorConfiguration.TabSize"
>
8
</value>
<value
type=
"bool"
key=
"EditorConfiguration.UseGlobal"
>
true
</value>
<value
type=
"int"
key=
"EditorConfiguration.Utf8BomBehavior"
>
1
</value>
<value
type=
"bool"
key=
"EditorConfiguration.addFinalNewLine"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.cleanIndentation"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.cleanWhitespace"
>
true
</value>
<value
type=
"bool"
key=
"EditorConfiguration.inEntireDocument"
>
false
</value>
</valuemap>
</data>
<data>
<variable>
ProjectExplorer.Project.PluginSettings
</variable>
<valuemap
type=
"QVariantMap"
/>
</data>
<data>
<variable>
ProjectExplorer.Project.Target.0
</variable>
<valuemap
type=
"QVariantMap"
>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Desktop
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
>
Desktop
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
{fa2d28f9-85de-4a75-8e79-69d805f974bf}
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveBuildConfiguration"
>
0
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveDeployConfiguration"
>
0
</value>
<value
type=
"int"
key=
"ProjectExplorer.Target.ActiveRunConfiguration"
>
0
</value>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.Target.BuildConfiguration.0"
>
<value
type=
"QString"
key=
"ProjectExplorer.BuildConfiguration.BuildDirectory"
>
/home/winlin/git/simple-rtmp-server/trunk/src/qt/build-qt-Desktop-Debug
</value>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildConfiguration.BuildStepList.0"
>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildStepList.Step.0"
>
<value
type=
"bool"
key=
"ProjectExplorer.BuildStep.Enabled"
>
true
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
qmake
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
QtProjectManager.QMakeBuildStep
</value>
<value
type=
"bool"
key=
"QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary"
>
false
</value>
<value
type=
"bool"
key=
"QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto"
>
true
</value>
<value
type=
"QString"
key=
"QtProjectManager.QMakeBuildStep.QMakeArguments"
></value>
<value
type=
"bool"
key=
"QtProjectManager.QMakeBuildStep.QMakeForced"
>
false
</value>
</valuemap>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildStepList.Step.1"
>
<value
type=
"bool"
key=
"ProjectExplorer.BuildStep.Enabled"
>
true
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Make
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
Qt4ProjectManager.MakeStep
</value>
<valuelist
type=
"QVariantList"
key=
"Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"
>
<value
type=
"QString"
>
-w
</value>
<value
type=
"QString"
>
-r
</value>
</valuelist>
<value
type=
"bool"
key=
"Qt4ProjectManager.MakeStep.Clean"
>
false
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.MakeStep.MakeArguments"
></value>
<value
type=
"QString"
key=
"Qt4ProjectManager.MakeStep.MakeCommand"
></value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.BuildStepList.StepsCount"
>
2
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Build
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
ProjectExplorer.BuildSteps.Build
</value>
</valuemap>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildConfiguration.BuildStepList.1"
>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildStepList.Step.0"
>
<value
type=
"bool"
key=
"ProjectExplorer.BuildStep.Enabled"
>
true
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Make
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
Qt4ProjectManager.MakeStep
</value>
<valuelist
type=
"QVariantList"
key=
"Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"
>
<value
type=
"QString"
>
-w
</value>
<value
type=
"QString"
>
-r
</value>
</valuelist>
<value
type=
"bool"
key=
"Qt4ProjectManager.MakeStep.Clean"
>
true
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.MakeStep.MakeArguments"
>
clean
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.MakeStep.MakeCommand"
></value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.BuildStepList.StepsCount"
>
1
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Clean
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
ProjectExplorer.BuildSteps.Clean
</value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.BuildConfiguration.BuildStepListCount"
>
2
</value>
<value
type=
"bool"
key=
"ProjectExplorer.BuildConfiguration.ClearSystemEnvironment"
>
false
</value>
<valuelist
type=
"QVariantList"
key=
"ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"
/>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Debug
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
Qt4ProjectManager.Qt4BuildConfiguration
</value>
<value
type=
"int"
key=
"Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration"
>
2
</value>
<value
type=
"bool"
key=
"Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild"
>
true
</value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.Target.BuildConfigurationCount"
>
1
</value>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.Target.DeployConfiguration.0"
>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.BuildConfiguration.BuildStepList.0"
>
<value
type=
"int"
key=
"ProjectExplorer.BuildStepList.StepsCount"
>
0
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Deploy
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
ProjectExplorer.BuildSteps.Deploy
</value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.BuildConfiguration.BuildStepListCount"
>
1
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
Deploy locally
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
ProjectExplorer.DefaultDeployConfiguration
</value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.Target.DeployConfigurationCount"
>
1
</value>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.Target.PluginSettings"
/>
<valuemap
type=
"QVariantMap"
key=
"ProjectExplorer.Target.RunConfiguration.0"
>
<valuelist
type=
"QVariantList"
key=
"Analyzer.Valgrind.AddedSuppressionFiles"
/>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Callgrind.CollectBusEvents"
>
false
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Callgrind.CollectSystime"
>
false
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Callgrind.EnableBranchSim"
>
false
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Callgrind.EnableCacheSim"
>
false
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Callgrind.EnableEventToolTips"
>
true
</value>
<value
type=
"double"
key=
"Analyzer.Valgrind.Callgrind.MinimumCostRatio"
>
0.01
</value>
<value
type=
"double"
key=
"Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio"
>
10
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.FilterExternalIssues"
>
true
</value>
<value
type=
"int"
key=
"Analyzer.Valgrind.LeakCheckOnFinish"
>
1
</value>
<value
type=
"int"
key=
"Analyzer.Valgrind.NumCallers"
>
25
</value>
<valuelist
type=
"QVariantList"
key=
"Analyzer.Valgrind.RemovedSuppressionFiles"
/>
<value
type=
"int"
key=
"Analyzer.Valgrind.SelfModifyingCodeDetection"
>
1
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.Settings.UseGlobalSettings"
>
true
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.ShowReachable"
>
false
</value>
<value
type=
"bool"
key=
"Analyzer.Valgrind.TrackOrigins"
>
true
</value>
<value
type=
"QString"
key=
"Analyzer.Valgrind.ValgrindExecutable"
>
valgrind
</value>
<valuelist
type=
"QVariantList"
key=
"Analyzer.Valgrind.VisibleErrorKinds"
>
<value
type=
"int"
>
0
</value>
<value
type=
"int"
>
1
</value>
<value
type=
"int"
>
2
</value>
<value
type=
"int"
>
3
</value>
<value
type=
"int"
>
4
</value>
<value
type=
"int"
>
5
</value>
<value
type=
"int"
>
6
</value>
<value
type=
"int"
>
7
</value>
<value
type=
"int"
>
8
</value>
<value
type=
"int"
>
9
</value>
<value
type=
"int"
>
10
</value>
<value
type=
"int"
>
11
</value>
<value
type=
"int"
>
12
</value>
<value
type=
"int"
>
13
</value>
<value
type=
"int"
>
14
</value>
</valuelist>
<value
type=
"int"
key=
"PE.EnvironmentAspect.Base"
>
2
</value>
<valuelist
type=
"QVariantList"
key=
"PE.EnvironmentAspect.Changes"
/>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DefaultDisplayName"
>
srs-qt
</value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.DisplayName"
></value>
<value
type=
"QString"
key=
"ProjectExplorer.ProjectConfiguration.Id"
>
Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/simple-rtmp-server/trunk/src/qt/srs/srs-qt.pro
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"
>
-c conf/console.conf
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.Qt4RunConfiguration.ProFile"
>
srs-qt.pro
</value>
<value
type=
"bool"
key=
"Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix"
>
false
</value>
<value
type=
"bool"
key=
"Qt4ProjectManager.Qt4RunConfiguration.UseTerminal"
>
true
</value>
<value
type=
"QString"
key=
"Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"
>
/home/winlin/git/simple-rtmp-server/trunk
</value>
<value
type=
"uint"
key=
"RunConfiguration.QmlDebugServerPort"
>
3768
</value>
<value
type=
"bool"
key=
"RunConfiguration.UseCppDebugger"
>
false
</value>
<value
type=
"bool"
key=
"RunConfiguration.UseCppDebuggerAuto"
>
true
</value>
<value
type=
"bool"
key=
"RunConfiguration.UseMultiProcess"
>
false
</value>
<value
type=
"bool"
key=
"RunConfiguration.UseQmlDebugger"
>
false
</value>
<value
type=
"bool"
key=
"RunConfiguration.UseQmlDebuggerAuto"
>
true
</value>
</valuemap>
<value
type=
"int"
key=
"ProjectExplorer.Target.RunConfigurationCount"
>
1
</value>
</valuemap>
</data>
<data>
<variable>
ProjectExplorer.Project.TargetCount
</variable>
<value
type=
"int"
>
1
</value>
</data>
<data>
<variable>
ProjectExplorer.Project.Updater.EnvironmentId
</variable>
<value
type=
"QByteArray"
>
{67c55164-ec8b-40af-90ff-d8b0b02de43a}
</value>
</data>
<data>
<variable>
ProjectExplorer.Project.Updater.FileVersion
</variable>
<value
type=
"int"
>
15
</value>
</data>
</qtcreator>
...
...
trunk/src/
srs
/init → trunk/src/
upp
/init
查看文件 @
b405791
trunk/src/
srs
/srs.upp → trunk/src/
upp
/srs.upp
查看文件 @
b405791
请
注册
或
登录
后发表评论