LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Solving problems while compiling jack2 on macOS X with dbus support (#434)" 

Reduce code bloat by removing support of non-libre operating system

This reverts commit bb3f5cb296.
This commit is contained in:
Nedko Arnaudov 2023-11-18 16:47:38 +02:00
parent caa739fbf9
commit b1ec48747c
4 changed files with 9 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbus/controller.c
View File

@ -27,13 +27,13 @@
#include <dbus/dbus.h>
#include <assert.h>
#include <unistd.h>
#include <sys/sysinfo.h>
#include <errno.h>
#include "controller.h"
#include "controller_internal.h"
#include "xml.h"
#include "reserve.h"
#include "uptime.h"
struct jack_dbus_interface_descriptor * g_jackcontroller_interfaces[] =
{
@ -787,18 +787,18 @@ void
jack_controller_run(
void * context)
{
long ut;
struct sysinfo si;
if (controller_ptr->pending_save == 0)
{
return;
}
if ((ut = uptime()) < 0)
if (sysinfo(&si) != 0)
{
jack_error(UPTIME_FUNCTION_NAME "() failed with %d", errno);
jack_error("sysinfo() failed with %d", errno);
}
else if (ut < controller_ptr->pending_save + 2) /* delay save by two seconds */
else if (si.uptime < controller_ptr->pending_save + 2) /* delay save by two seconds */
{
return;
}
@ -813,15 +813,15 @@ void
jack_controller_pending_save(
struct jack_controller * controller_ptr)
{
long ut;
struct sysinfo si;
if ((ut = uptime()) < 0)
if (sysinfo(&si) != 0)
{
jack_error(UPTIME_FUNCTION_NAME "() failed with %d.", errno);
jack_error("sysinfo() failed with %d.", errno);
controller_ptr->pending_save = 0;
jack_controller_settings_save_auto(controller_ptr);
return;
}
controller_ptr->pending_save = ut;
controller_ptr->pending_save = si.uptime;
}

3
dbus/wscript
View File

@ -79,9 +79,6 @@ def build(bld):
'reserve.c',
]
obj.use = ['JACKSERVER']
obj.source += [
'../linux/uptime.c',
]
if bld.env['IS_LINUX']:
obj.use += ['PTHREAD', 'DL', 'RT', 'DBUS-1', 'EXPAT']
if bld.env['IS_FREEBSD']:

12
linux/uptime.c
View File

@ -1,12 +0,0 @@
#include <sys/sysinfo.h>
long uptime(void) {
struct sysinfo si;
if (sysinfo(&si) != 0)
{
return -1;
}
return si.uptime;
}

27
linux/uptime.h
View File

@ -1,27 +0,0 @@
/*
Copyright (C) 2004-2005 Grame
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __uptime_LINUX__
#define __uptime_LINUX__
#define UPTIME_FUNCTION_NAME "sysinfo"
long uptime(void);
#endif