Changeset 4811:8d0d713ca0c1 in roaraudio for roard/roard.c
- Timestamp:
- 03/27/11 13:38:18 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r4810 r4811 1693 1693 int realtime = 0; 1694 1694 int sysclocksync = 0; 1695 char * driver = NULL;1696 char * device = NULL;1697 #ifdef ROAR_HAVE_MAIN_ARGS1698 char * opts = NULL;1699 #endif1700 1695 // char * server = ROAR_DEFAULT_SOCK_GLOBAL; 1701 1696 #ifdef ROAR_SUPPORT_LISTEN … … 1706 1701 struct roar_audio_info sock_info = {0, 0, 0, 0}; 1707 1702 #endif 1708 int drvid;1709 1703 #ifndef ROAR_WITHOUT_DCOMP_SOURCES 1710 1704 char * s_drv = "cf"; … … 1763 1757 struct servent * serv = NULL; 1764 1758 #endif 1765 DRIVER_USERDATA_T drvinst;1766 1759 struct roar_client * self = NULL; 1767 1760 #ifdef ROAR_HAVE_LIBDNET … … 2068 2061 } 2069 2062 2070 } else if ( strcmp(k, "-d") == 0 || strcmp(k, "--driver") == 0 ) {2071 _CKHAVEARGS(1);2072 driver = argv[++i];2073 if ( strcmp(driver, "list") == 0 ) {2074 ROAR_WARN("The option is obsolete, use --list-driver!");2075 print_driverlist();2076 return 0;2077 }2078 } else if ( strcmp(k, "-D") == 0 || strcmp(k, "--device") == 0 ) {2079 _CKHAVEARGS(1);2080 device = argv[++i];2081 } else if ( strcmp(k, "-dO") == 0 ) {2082 _CKHAVEARGS(1);2083 opts = argv[++i];2084 2063 } else if ( strcmp(k, "--list-driver") == 0 ) { 2085 2064 print_driverlist(); … … 2669 2648 } 2670 2649 2671 if ( driver == NULL ) {2672 driver = "null";2673 } else {2674 ROAR_ERR("Usage of old driver interface. use -o not -d!");2675 ROAR_WARN("-d will be removed within the next releases");2676 }2677 2678 if ( driver_open(&drvinst, &drvid, driver, device, &sa) == -1 ) {2679 ROAR_ERR("Can not open output driver!");2680 return 1;2681 }2682 2683 2650 if ( samples_init() == -1 ) { 2684 2651 ROAR_ERR("Can not init samples!"); … … 2885 2852 // start main loop... 2886 2853 ROAR_INFO("Entering main loop", ROAR_DBG_INFO_INFO); 2887 main_loop( drvid, drvinst,&sa, sysclocksync);2854 main_loop(&sa, sysclocksync); 2888 2855 ROAR_INFO("Left main loop", ROAR_DBG_INFO_INFO); 2889 2856 2890 2857 // clean up. 2891 2858 clean_quit_prep(); 2892 driver_close(drvinst, drvid);2893 2859 output_buffer_free(); 2894 2860 … … 2978 2944 2979 2945 clean_quit_prep(); 2980 // driver_close(drvinst, drvid);2981 2946 // output_buffer_free(); 2982 2947
Note: See TracChangeset
for help on using the changeset viewer.