external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

miracle-dispd: rename files and class names to make naming consistent

Browse source 
Change-Id: Id2f5a8d6bbfbbd205dbe25e8b8bc0ddd289591e5
This commit is contained in:
Derek Dai 2017-05-11 11:30:41 +08:00
parent 0648bb70a9
commit c388985345
No known key found for this signature in database
GPG key ID: E109CC97553EF009
22 changed files with 1365 additions and 1360 deletions
Download patch file Download diff file Expand all files Collapse all files

12
res/CMakeLists.txt
View file

@ -36,13 +36,13 @@ target_link_libraries(
)
vala_precompile(
WFDCTL_SRC wfdctl
wfdctl.vala
DISPCTL_SRC dispctl
dispctl.vala
networkmanager.vala
miracle-wifi.vala
miracle-wfd.vala
GENERATE_HEADER
wfdctl.h
dispctl.h
CUSTOM_VAPIS
sigint.vapi
OPTIONS
@ -52,14 +52,14 @@ vala_precompile(
gio-2.0
gdk-3.0
)
add_executable(miracle-wfdctl ${WFDCTL_SRC} sigint.c)
target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES})
add_executable(miracle-dispctl ${DISPCTL_SRC} sigint.c)
target_link_libraries(miracle-dispctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES})
########### install files ###############
install(TARGETS gstencoder DESTINATION bin)
install(TARGETS miracle-wfdctl DESTINATION bin)
install(TARGETS miracle-dispctl DESTINATION bin)
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=system_bus_services_dir dbus-1

28
res/wfdctl.vala → res/dispctl.vala
View file

@ -35,7 +35,7 @@ const string IFACE_PEER = "org.freedesktop.miracle.wifi.Peer";
const string IFACE_SINK = "org.freedesktop.miracle.wfd.Sink";
const string IFACE_SESSION = "org.freedesktop.miracle.wfd.Session";
errordomain WfdCtlError
errordomain DispCtlError
{
NO_SUCH_NIC,
TIMEOUT,
@ -70,7 +70,7 @@ private string decode_path(string s)
return d.str;
}
private class WfdCtl : GLib.Application
private class DispCtl : GLib.Application
{
static string opt_iface;
static string opt_wfd_subelems;
@ -120,9 +120,9 @@ private class WfdCtl : GLib.Application
{ null },
};
public WfdCtl()
public DispCtl()
{
Object(application_id: "org.freedesktop.miracle.WfdCtl",
Object(application_id: "org.freedesktop.miracle.DispCtl",
flags: ApplicationFlags.FLAGS_NONE);
devices = new HashTable<string, Device>(str_hash, str_equal);
@ -341,7 +341,7 @@ private class WfdCtl : GLib.Application
Link l = find_link_by_name(opt_iface);
if(null == l) {
throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
throw new DispCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
opt_iface);
}
@ -367,7 +367,7 @@ private class WfdCtl : GLib.Application
}
if(-1 == l.p2p_state) {
throw new WfdCtlError.NO_P2P_SUPPORT("link %s has no P2P supporting", l.interface_name);
throw new DispCtlError.NO_P2P_SUPPORT("link %s has no P2P supporting", l.interface_name);
}
else if(0 == l.p2p_state) {
info("wait for P2P supporting status...");
@ -441,7 +441,7 @@ private class WfdCtl : GLib.Application
}
if(null == m) {
throw new WfdCtlError.MONITOR_GONE("specified monitor disappeared");
throw new DispCtlError.MONITOR_GONE("specified monitor disappeared");
}
g = m.geometry;
@ -455,7 +455,7 @@ private class WfdCtl : GLib.Application
: opt_monitor_num;
if(s.get_n_monitors() <= m) {
throw new WfdCtlError.MONITOR_GONE("specified monitor disappeared");
throw new DispCtlError.MONITOR_GONE("specified monitor disappeared");
}
s.get_monitor_geometry(m, out g);
@ -523,7 +523,7 @@ private class WfdCtl : GLib.Application
Error error = null;
var timeout_src = new TimeoutSource(10);
timeout_src.set_callback(() => {
error = new WfdCtlError.TIMEOUT("failed to establish session");
error = new DispCtlError.TIMEOUT("failed to establish session");
Idle.add(establish_session.callback);
return false;
});
@ -561,7 +561,7 @@ private class WfdCtl : GLib.Application
Link l = find_link_by_name(opt_iface);
if(null == l) {
throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
throw new DispCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
opt_iface);
}
@ -731,7 +731,7 @@ private class WfdCtl : GLib.Application
private async void wait_prop_changed<T>(T o,
string name,
uint timeout = 1) throws WfdCtlError
uint timeout = 1) throws DispCtlError
{
ulong prop_changed_id = (o as DBusProxy).g_properties_changed.connect((props) => {
string k;
@ -764,7 +764,7 @@ private class WfdCtl : GLib.Application
(o as DBusProxy).disconnect(prop_changed_id);
if(timed_out) {
throw new WfdCtlError.TIMEOUT("timeout to wait for property %s change",
throw new DispCtlError.TIMEOUT("timeout to wait for property %s change",
name);
}
}
@ -777,10 +777,10 @@ int main(string[]? argv)
Environment.set_prgname(Path.get_basename(argv[0]));
Application app = new WfdCtl();
Application app = new DispCtl();
app.set_default();
Sigint.add_watch((app as WfdCtl).stop_wireless_display);
Sigint.add_watch((app as DispCtl).stop_wireless_display);
try {
app.register();

4
res/meson.build
View file

@ -60,14 +60,14 @@ executable('gstencoder', 'gstencoder.vala',
install: true,
vala_args: ['--pkg=posix'])
miracle_wfdctl_src = ['wfdctl.vala',
miracle_dispctl_src = ['dispctl.vala',
'sigint.vapi',
'sigint.c',
'networkmanager.vala',
'miracle-wifi.vala',
'miracle-wfd.vala'
]
executable('miracle-wfdctl', miracle_wfdctl_src,
executable('miracle-dispctl', miracle_dispctl_src,
dependencies: [gio2, gdk3],
vala_args: valac_extra_args,
install: true