pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

move subpackages into internal/

pull/169/head
aler9 5 years ago
parent
42fa504014
commit
5facab1a48
24 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      internal/client/client.go
  2. 0
      internal/client/utils.go
  3. 10
      internal/clientman/clientman.go
  4. 4
      internal/conf/conf.go
  5. 0
      internal/conf/pathconf.go
  6. 0
      internal/conf/utils.go
  7. 0
      internal/confenv/confenv.go
  8. 0
      internal/confwatcher/confwatcher.go
  9. 0
      internal/externalcmd/externalcmd.go
  10. 2
      internal/loghandler/loghandler.go
  11. 2
      internal/metrics/metrics.go
  12. 12
      internal/path/path.go
  13. 0
      internal/path/readersmap.go
  14. 8
      internal/pathman/pathman.go
  15. 0
      internal/pprof/pprof.go
  16. 0
      internal/servertcp/server.go
  17. 0
      internal/serverudp/server.go
  18. 2
      internal/sourcertmp/source.go
  19. 2
      internal/sourcertsp/source.go
  20. 0
      internal/stats/stats.go
  21. 0
      internal/syslog/syslog_unix.go
  22. 0
      internal/syslog/syslog_win.go
  23. 20
      main.go
  24. 2
      main_test.go

8
client/client.go → internal/client/client.go
Unescape View File

@ -17,10 +17,10 @@ import (
"github.com/aler9/gortsplib/headers" "github.com/aler9/gortsplib/headers"
"github.com/aler9/gortsplib/rtcpreceiver" "github.com/aler9/gortsplib/rtcpreceiver"
"github.com/aler9/rtsp-simple-server/conf" "github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/externalcmd" "github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/serverudp" "github.com/aler9/rtsp-simple-server/internal/serverudp"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
const ( const (

0
client/utils.go → internal/client/utils.go
Unescape View File

10
clientman/clientman.go → internal/clientman/clientman.go
Unescape View File

@ -8,11 +8,11 @@ import (
"github.com/aler9/gortsplib/base" "github.com/aler9/gortsplib/base"
"github.com/aler9/gortsplib/headers" "github.com/aler9/gortsplib/headers"
"github.com/aler9/rtsp-simple-server/client" "github.com/aler9/rtsp-simple-server/internal/client"
"github.com/aler9/rtsp-simple-server/pathman" "github.com/aler9/rtsp-simple-server/internal/pathman"
"github.com/aler9/rtsp-simple-server/servertcp" "github.com/aler9/rtsp-simple-server/internal/servertcp"
"github.com/aler9/rtsp-simple-server/serverudp" "github.com/aler9/rtsp-simple-server/internal/serverudp"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
type Parent interface { type Parent interface {

4
conf/conf.go → internal/conf/conf.go
Unescape View File

@ -9,8 +9,8 @@ import (
"github.com/aler9/gortsplib/headers" "github.com/aler9/gortsplib/headers"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/aler9/rtsp-simple-server/confenv" "github.com/aler9/rtsp-simple-server/internal/confenv"
"github.com/aler9/rtsp-simple-server/loghandler" "github.com/aler9/rtsp-simple-server/internal/loghandler"
) )
type Conf struct { type Conf struct {

0
conf/pathconf.go → internal/conf/pathconf.go
Unescape View File

0
conf/utils.go → internal/conf/utils.go
Unescape View File

0
confenv/confenv.go → internal/confenv/confenv.go vendored
Unescape View File

0
confwatcher/confwatcher.go → internal/confwatcher/confwatcher.go
Unescape View File

0
externalcmd/externalcmd.go → internal/externalcmd/externalcmd.go
Unescape View File

2
loghandler/loghandler.go → internal/loghandler/loghandler.go
Unescape View File

@ -5,7 +5,7 @@ import (
"log" "log"
"os" "os"
"github.com/aler9/rtsp-simple-server/syslog" "github.com/aler9/rtsp-simple-server/internal/syslog"
) )
type Destination int type Destination int

2
metrics/metrics.go → internal/metrics/metrics.go
Unescape View File

@ -9,7 +9,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
const ( const (

12
path/path.go → internal/path/path.go
Unescape View File

@ -11,12 +11,12 @@ import (
"github.com/aler9/gortsplib" "github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/base" "github.com/aler9/gortsplib/base"
"github.com/aler9/rtsp-simple-server/client" "github.com/aler9/rtsp-simple-server/internal/client"
"github.com/aler9/rtsp-simple-server/conf" "github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/externalcmd" "github.com/aler9/rtsp-simple-server/internal/externalcmd"
"github.com/aler9/rtsp-simple-server/sourcertmp" "github.com/aler9/rtsp-simple-server/internal/sourcertmp"
"github.com/aler9/rtsp-simple-server/sourcertsp" "github.com/aler9/rtsp-simple-server/internal/sourcertsp"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
func newEmptyTimer() *time.Timer { func newEmptyTimer() *time.Timer {

0
path/readersmap.go → internal/path/readersmap.go
Unescape View File

8
pathman/pathman.go → internal/pathman/pathman.go
Unescape View File

@ -9,10 +9,10 @@ import (
"github.com/aler9/gortsplib/base" "github.com/aler9/gortsplib/base"
"github.com/aler9/gortsplib/headers" "github.com/aler9/gortsplib/headers"
"github.com/aler9/rtsp-simple-server/client" "github.com/aler9/rtsp-simple-server/internal/client"
"github.com/aler9/rtsp-simple-server/conf" "github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/path" "github.com/aler9/rtsp-simple-server/internal/path"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
type Parent interface { type Parent interface {

0
pprof/pprof.go → internal/pprof/pprof.go
Unescape View File

0
servertcp/server.go → internal/servertcp/server.go
Unescape View File

0
serverudp/server.go → internal/serverudp/server.go
Unescape View File

2
sourcertmp/source.go → internal/sourcertmp/source.go
Unescape View File

@ -14,7 +14,7 @@ import (
"github.com/notedit/rtmp/codec/h264" "github.com/notedit/rtmp/codec/h264"
"github.com/notedit/rtmp/format/rtmp" "github.com/notedit/rtmp/format/rtmp"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
const ( const (

2
sourcertsp/source.go → internal/sourcertsp/source.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/aler9/gortsplib" "github.com/aler9/gortsplib"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
const ( const (

0
stats/stats.go → internal/stats/stats.go
Unescape View File

0
syslog/syslog_unix.go → internal/syslog/syslog_unix.go
Unescape View File

0
syslog/syslog_win.go → internal/syslog/syslog_win.go
Unescape View File

20
main.go
Unescape View File

@ -10,16 +10,16 @@ import (
"github.com/aler9/gortsplib" "github.com/aler9/gortsplib"
"gopkg.in/alecthomas/kingpin.v2" "gopkg.in/alecthomas/kingpin.v2"
"github.com/aler9/rtsp-simple-server/clientman" "github.com/aler9/rtsp-simple-server/internal/clientman"
"github.com/aler9/rtsp-simple-server/conf" "github.com/aler9/rtsp-simple-server/internal/conf"
"github.com/aler9/rtsp-simple-server/confwatcher" "github.com/aler9/rtsp-simple-server/internal/confwatcher"
"github.com/aler9/rtsp-simple-server/loghandler" "github.com/aler9/rtsp-simple-server/internal/loghandler"
"github.com/aler9/rtsp-simple-server/metrics" "github.com/aler9/rtsp-simple-server/internal/metrics"
"github.com/aler9/rtsp-simple-server/pathman" "github.com/aler9/rtsp-simple-server/internal/pathman"
"github.com/aler9/rtsp-simple-server/pprof" "github.com/aler9/rtsp-simple-server/internal/pprof"
"github.com/aler9/rtsp-simple-server/servertcp" "github.com/aler9/rtsp-simple-server/internal/servertcp"
"github.com/aler9/rtsp-simple-server/serverudp" "github.com/aler9/rtsp-simple-server/internal/serverudp"
"github.com/aler9/rtsp-simple-server/stats" "github.com/aler9/rtsp-simple-server/internal/stats"
) )
var Version = "v0.0.0" var Version = "v0.0.0"

2
main_test.go
Unescape View File

@ -14,7 +14,7 @@ import (
"github.com/aler9/gortsplib" "github.com/aler9/gortsplib"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/aler9/rtsp-simple-server/conf" "github.com/aler9/rtsp-simple-server/internal/conf"
) )
var ownDockerIp = func() string { var ownDockerIp = func() string {

Write Preview
Loading…
Cancel
Save