Changeset 3373:97166aec67ab in roaraudio
- Timestamp:
- 02/09/10 20:07:31 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r3358 r3373 167 167 #ifdef ROAR_HAVE_LIBSLP 168 168 " --slp - Enable OpenSLP support\n" 169 #endif 170 #ifdef ROAR_HAVE_LIBX11 171 " --x11 - Enable X11 support\n" 169 172 #endif 170 173 " --jumbo-mtu MTU - Sets the MTU for Jumbo Packets\n" … … 769 772 } 770 773 774 // X11: 775 #ifdef ROAR_HAVE_LIBX11 776 int register_x11 (int unreg, char * sockname) { 777 struct roar_x11_connection * x11con = NULL; 778 int ret = 0; 779 780 if ( (x11con = roar_x11_connect(NULL)) == NULL ) 781 return -1; 782 783 if ( unreg ) { 784 if ( roar_x11_delete_prop(x11con, "ROAR_SERVER") == -1 ) 785 ret = -1; 786 } else { 787 if ( roar_x11_set_prop(x11con, "ROAR_SERVER", sockname) == -1 ) 788 ret = -1; 789 } 790 791 roar_x11_disconnect(x11con); 792 793 return ret; 794 } 795 #endif 771 796 772 797 // SLP: … … 922 947 int reg_slp = 0; 923 948 #endif 949 #ifdef ROAR_HAVE_LIBX11 950 int reg_x11 = 0; 951 #endif 924 952 #ifdef ROAR_HAVE_CHROOT 925 953 char * chrootdir = NULL; … … 1449 1477 reg_slp = 1; 1450 1478 #else 1451 ROAR_ERR("No OpenSLP support compiled in!"); 1452 return 1; 1453 #endif 1479 ROAR_ERR("No OpenSLP support compiled in!"); 1480 return 1; 1481 #endif 1482 1483 } else if ( strcmp(k, "--x11") == 0 ) { 1484 #ifdef ROAR_HAVE_LIBX11 1485 reg_x11 = 1; 1486 #else 1487 ROAR_ERR("No X11 support compiled in!"); 1488 return 1; 1489 #endif 1490 1454 1491 1455 1492 } else if ( strcmp(k, "--jumbo-mtu") == 0 ) { … … 1725 1762 #endif 1726 1763 1764 #ifdef ROAR_HAVE_LIBX11 1765 if ( reg_x11 ) { 1766 register_x11(0, sock_addr); 1767 } 1768 #endif 1769 1727 1770 // start main loop... 1728 1771 main_loop(drvid, drvinst, &sa, sysclocksync); … … 1742 1785 #ifdef ROAR_HAVE_LIBSLP 1743 1786 register_slp(1, NULL); 1787 #endif 1788 1789 #ifdef ROAR_HAVE_LIBX11 1790 register_x11(1, NULL); 1744 1791 #endif 1745 1792
Note: See TracChangeset
for help on using the changeset viewer.