sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make get_video_desc() return the active console if 

passed a null argument (channel).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97389 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo 2008-01-09 12:13:32 +00:00
parent 9b903da621
commit bbbef73276
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_oss.c
View File

@ -307,10 +307,12 @@ struct chan_oss_pvt {
/*! forward declaration */
static struct chan_oss_pvt *find_desc(char *dev);
static char *oss_active; /*!< the active device */
/*! \brief return the pointer to the video descriptor */
struct video_desc *get_video_desc(struct ast_channel *c)
{
struct chan_oss_pvt *o = c->tech_pvt;
struct chan_oss_pvt *o = c ? c->tech_pvt : find_desc(oss_active);
return o ? o->env : NULL;
}
static struct chan_oss_pvt oss_default = {
@ -327,7 +329,6 @@ static struct chan_oss_pvt oss_default = {
.boost = BOOST_SCALE,
};
static char *oss_active; /*!< the active device */
static int setformat(struct chan_oss_pvt *o, int mode);