← Back to branch summary

~ubuntu-branches/ubuntu/wily/me-tv/wily

« back to all changes in this revision

Viewing changes to src/scan_dialog.cc

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lamothe
  • Date: 2010-06-20 21:51:41 UTC
  • mfrom: (1.1.13 upstream) (3.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100620215141-jfzya7s0a5g8xxl4
Tags: 1.2.6-1
http://bugs.debian.org/575122
http://bugs.debian.org/582613
* New upstream release
* Fix "needs to depend on libxine1-x" updated control file to
  depend on ${xine-x:Depends} (Closes: #575122)
* Fix "EPG texts with ampersands not shown" encoded XML strings
  in GTK controls that use markup (Closes: #582613)
* Updated the description of the application to remove reference
  to MythTV

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scan_dialog.cc
136
136
        list_store = Gtk::ListStore::create(columns);
137
137
        tree_view_scanned_channels->set_model(list_store);
138
138
        tree_view_scanned_channels->append_column(_("Service Name"), columns.column_name);
 
139
        tree_view_scanned_channels->append_column(_("Signal Strength"), columns.column_signal_strength);
 
140
        tree_view_scanned_channels->set_enable_search(true);
 
141
        tree_view_scanned_channels->set_search_column(columns.column_name);
139
142
        
140
143
        Glib::RefPtr<Gtk::TreeSelection> selection = tree_view_scanned_channels->get_selection();
141
144
        selection->set_mode(Gtk::SELECTION_MULTIPLE);
159
162
        combo_box_auto_scan_range->append_text(_("France"),                     "FR");
160
163
        combo_box_auto_scan_range->append_text(_("Germany"),            "DE");
161
164
        combo_box_auto_scan_range->append_text(_("Italy"),                      "IT");
 
165
        combo_box_auto_scan_range->append_text(_("Lithuania"),          "LT");
162
166
        combo_box_auto_scan_range->append_text(_("New Zealand"),        "NZ");
163
167
        combo_box_auto_scan_range->append_text(_("Spain"),                      "ES");
164
168
        combo_box_auto_scan_range->append_text(_("Slovenia"),           "SI");
244
248
                scan_thread = NULL;
245
249
 
246
250
                get_application().stream_manager.start();
 
251
                get_application().select_channel_to_play();
247
252
        }
248
253
}
249
254
 
393
398
                                        throw Exception(_("Failed to import: importing a channels.conf is only supported with DVB-T, DVB-C, DVB-S and ATSC"));
394
399
                        }
395
400
 
396
 
                        add_channel_row(channel);
 
401
                        add_channel_row(channel, 0);
397
402
                }               
398
403
        }
399
404
 
403
408
        g_debug("Finished importing channels");
404
409
}
405
410
 
406
 
void ScanDialog::add_channel_row(const Channel& channel)
 
411
void ScanDialog::add_channel_row(const Channel& channel, guint signal_strength)
407
412
{       
408
413
        Gtk::TreeModel::iterator iterator = list_store->append();
409
414
        
412
417
        row[columns.column_name]                                = channel.name;
413
418
        row[columns.column_frontend_parameters] = channel.transponder.frontend_parameters;
414
419
        row[columns.column_polarisation]                = channel.transponder.polarisation;
 
420
        row[columns.column_signal_strength]             = Glib::ustring::compose("%1%%", ((0xFFFF & signal_strength) * 100)/65356);
415
421
        tree_view_scanned_channels->get_selection()->select(row);
416
422
 
417
423
        channel_count++;
565
571
        hide();
566
572
}
567
573
 
568
 
void ScanDialog::on_signal_service(const struct dvb_frontend_parameters& frontend_parameters, guint service_id, const Glib::ustring& name, const guint polarisation)
 
574
void ScanDialog::on_signal_service(const struct dvb_frontend_parameters& frontend_parameters, guint service_id, const Glib::ustring& name, const guint polarisation, guint signal_strength)
569
575
{
570
576
        if (scan_thread != NULL && !scan_thread->is_terminated())
571
577
        {
601
607
                channel.transponder.frontend_parameters = frontend_parameters;
602
608
                channel.transponder.polarisation                = polarisation;
603
609
 
604
 
                add_channel_row(channel);
 
610
                add_channel_row(channel, signal_strength);
605
611
        }
606
612
}
607
613
 
748
754
                        frontend_parameters.u.ofdm.transmission_mode            = TRANSMISSION_MODE_8K;
749
755
                        add_scan_range(474000000, 850000000, 8000000, frontend_parameters);
750
756
                }
751
 
                else if (range == "ES")
 
757
                else if (range == "ES" || range == "LT")
752
758
                {
753
759
                        frontend_parameters.u.ofdm.bandwidth            = BANDWIDTH_8_MHZ;
754
760
                        add_scan_range(474000000, 858000000, 8000000, frontend_parameters);