Cleanup some code
authorJoão Paulo Rechi Vita <joao.vita@gmail.com>
Fri, 29 Aug 2008 14:56:12 +0000 (11:56 -0300)
committerLennart Poettering <lennart@poettering.net>
Wed, 10 Sep 2008 22:12:09 +0000 (01:12 +0300)
src/modules/module-bt-device.c

index c738a99..654130b 100644 (file)
@@ -272,9 +272,6 @@ static int bt_a2dp_init(struct userdata *u) {
             return -1;
     }
 
-//    if (cfg->has_channel_mode)
-//        cap->channel_mode = cfg->channel_mode;
-//    else 
     if (u->ss.channels == 2) {
         if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
             cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
@@ -292,9 +289,6 @@ static int bt_a2dp_init(struct userdata *u) {
         return -1;
     }
 
-//    if (cfg->has_block_length)
-//        cap->block_length = cfg->block_length;
-//    else 
     if (cap->block_length & BT_A2DP_BLOCK_LENGTH_16)
         cap->block_length = BT_A2DP_BLOCK_LENGTH_16;
     else if (cap->block_length & BT_A2DP_BLOCK_LENGTH_12)
@@ -308,8 +302,6 @@ static int bt_a2dp_init(struct userdata *u) {
         return -1;
     }
 
-//    if (cfg->has_subbands)
-//        cap->subbands = cfg->subbands;
     if (cap->subbands & BT_A2DP_SUBBANDS_8)
         cap->subbands = BT_A2DP_SUBBANDS_8;
     else if (cap->subbands & BT_A2DP_SUBBANDS_4)
@@ -319,19 +311,13 @@ static int bt_a2dp_init(struct userdata *u) {
         return -1;
     }
 
-//    if (cfg->has_allocation_method)
-//        cap->allocation_method = cfg->allocation_method;
     if (cap->allocation_method & BT_A2DP_ALLOCATION_LOUDNESS)
         cap->allocation_method = BT_A2DP_ALLOCATION_LOUDNESS;
     else if (cap->allocation_method & BT_A2DP_ALLOCATION_SNR)
         cap->allocation_method = BT_A2DP_ALLOCATION_SNR;
 
-//    if (cfg->has_bitpool)
-//        min_bitpool = max_bitpool = cfg->bitpool;
-//    else {
     min_bitpool = PA_MAX(MIN_BITPOOL, cap->min_bitpool);
     max_bitpool = PA_MIN(default_bitpool(cap->frequency, cap->channel_mode), cap->max_bitpool);
-//    }
 
     cap->min_bitpool = min_bitpool;
     cap->max_bitpool = max_bitpool;