Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dvblast
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
dvblast
Commits
77ea92e9
Commit
77ea92e9
authored
Nov 07, 2009
by
Marian Ďurkovič
Committed by
Christophe Massiot
Nov 07, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* dvb.c, dvblastctl.c: Simplify #ifdef's for different DVB API version.
parent
e1c6a703
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
dvb.c
dvb.c
+3
-3
dvblastctl.c
dvblastctl.c
+10
-11
No files found.
dvb.c
View file @
77ea92e9
...
@@ -374,9 +374,7 @@ static int FrontendDoDiseqc(void)
...
@@ -374,9 +374,7 @@ static int FrontendDoDiseqc(void)
switch
(
i_voltage
)
switch
(
i_voltage
)
{
{
#ifdef SEC_VOLTAGE_OFF
case
0
:
fe_voltage
=
SEC_VOLTAGE_OFF
;
break
;
case
0
:
fe_voltage
=
SEC_VOLTAGE_OFF
;
break
;
#endif
default:
default:
case
13
:
fe_voltage
=
SEC_VOLTAGE_13
;
break
;
case
13
:
fe_voltage
=
SEC_VOLTAGE_13
;
break
;
case
18
:
fe_voltage
=
SEC_VOLTAGE_18
;
break
;
case
18
:
fe_voltage
=
SEC_VOLTAGE_18
;
break
;
...
@@ -500,6 +498,8 @@ static int FrontendDoDiseqc(void)
...
@@ -500,6 +498,8 @@ static int FrontendDoDiseqc(void)
return
bis_frequency
;
return
bis_frequency
;
}
}
#define DVBAPI_VERSION ((DVB_API_VERSION)*100+(DVB_API_VERSION_MINOR))
#if DVB_API_VERSION >= 5
#if DVB_API_VERSION >= 5
/*****************************************************************************
/*****************************************************************************
...
@@ -741,7 +741,7 @@ static void FrontendSet( void )
...
@@ -741,7 +741,7 @@ static void FrontendSet( void )
i_frequency
,
i_srate
);
i_frequency
,
i_srate
);
break
;
break
;
#if
def FE_ATSC
#if
DVBAPI_VERSION >= 301
case
FE_ATSC
:
case
FE_ATSC
:
fep
.
frequency
=
i_frequency
;
fep
.
frequency
=
i_frequency
;
...
...
dvblastctl.c
View file @
77ea92e9
...
@@ -308,22 +308,21 @@ int main( int i_argc, char **ppsz_argv )
...
@@ -308,22 +308,21 @@ int main( int i_argc, char **ppsz_argv )
PRINT_CAPS
(
CAN_BANDWIDTH_AUTO
);
PRINT_CAPS
(
CAN_BANDWIDTH_AUTO
);
PRINT_CAPS
(
CAN_GUARD_INTERVAL_AUTO
);
PRINT_CAPS
(
CAN_GUARD_INTERVAL_AUTO
);
PRINT_CAPS
(
CAN_HIERARCHY_AUTO
);
PRINT_CAPS
(
CAN_HIERARCHY_AUTO
);
#ifdef FE_CAN_8VSB
PRINT_CAPS
(
CAN_MUTE_TS
);
#define DVBAPI_VERSION ((DVB_API_VERSION)*100+(DVB_API_VERSION_MINOR))
#if DVBAPI_VERSION >= 301
PRINT_CAPS
(
CAN_8VSB
);
PRINT_CAPS
(
CAN_8VSB
);
PRINT_CAPS
(
CAN_16VSB
);
PRINT_CAPS
(
CAN_16VSB
);
PRINT_CAPS
(
NEEDS_BENDING
);
PRINT_CAPS
(
CAN_RECOVER
);
#endif
#endif
#if DVB
_API_VERSION >= 5
#if DVB
API_VERSION >= 500
PRINT_CAPS
(
HAS_EXTENDED_CAPS
);
PRINT_CAPS
(
HAS_EXTENDED_CAPS
);
#ifdef FE_CAN_2G_MODULATION
PRINT_CAPS
(
CAN_2G_MODULATION
);
#endif
#endif
#endif
#if DVBAPI_VERSION >= 501
#ifdef FE_NEEDS_BENDING
PRINT_CAPS
(
CAN_2G_MODULATION
);
PRINT_CAPS
(
NEEDS_BENDING
);
#endif
PRINT_CAPS
(
CAN_MUTE_TS
);
#ifdef FE_CAN_RECOVER
PRINT_CAPS
(
CAN_RECOVER
);
#endif
#endif
#undef PRINT_CAPS
#undef PRINT_CAPS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment