|
a/src/main.cxx |
|
b/src/main.cxx |
|
... |
|
... |
414 |
|
414 |
|
415 |
// If neither OH nor AV are enable, run as pure media server. This
|
415 |
// If neither OH nor AV are enable, run as pure media server. This
|
416 |
// is another way to do it besides the -m option
|
416 |
// is another way to do it besides the -m option
|
417 |
if (!enableOH && !enableAV) {
|
417 |
if (!enableOH && !enableAV) {
|
418 |
msonly = true;
|
418 |
msonly = true;
|
|
|
419 |
// Set inprocessms in this case ! No need to fork
|
|
|
420 |
inprocessms = true;
|
419 |
}
|
421 |
}
|
420 |
|
422 |
|
421 |
if (msonly && !enableMediaServer) {
|
423 |
if (msonly && !enableMediaServer) {
|
422 |
cerr << "Pure Media Server mode requested, but this is "
|
424 |
cerr << "Pure Media Server mode requested, but this is "
|
423 |
"disabled by the configuration or by absent Media Server "
|
425 |
"disabled by the configuration or by absent Media Server "
|
|
... |
|
... |
677 |
// deleted when we return from main (on a signal), ensuring that
|
679 |
// deleted when we return from main (on a signal), ensuring that
|
678 |
// the child process gets killed.
|
680 |
// the child process gets killed.
|
679 |
ExecCmd cmd;
|
681 |
ExecCmd cmd;
|
680 |
|
682 |
|
681 |
if (inprocessms) {
|
683 |
if (inprocessms) {
|
682 |
if (op_flags & OPT_m) {
|
684 |
if (msonly) {
|
683 |
msfiles = &files;
|
685 |
msfiles = &files;
|
684 |
}
|
686 |
}
|
685 |
// Create the Media Server embedded device object. There needs
|
687 |
// Create the Media Server embedded device object. There needs
|
686 |
// be no reference to the root object because there can be
|
688 |
// be no reference to the root object because there can be
|
687 |
// only one (libupnp restriction)
|
689 |
// only one (libupnp restriction)
|