diff options
| author | Stefan Völkel <sv@its-v.de> | 2016-03-23 10:23:33 +0100 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-03-24 00:20:52 +0000 |
| commit | 56d48b58808b4d77a3fa9df5c71caece71f10d52 (patch) | |
| tree | ebf997d5124292de8d6696a610abbb004bfa8769 /ui/gtk/rtp_player.c | |
| parent | 01faf397940c3f3e59078d648440a06140abaa4f (diff) | |
| download | wireshark-56d48b58808b4d77a3fa9df5c71caece71f10d52.tar.gz | |
rtp_player: fix build with gtk < 2.22.0
RTP stream structs have been consolidated (see
I2b3f8f2051394a6a98a5c7bc49c117f07161d031), but gtk versions
< 2.22.0 seem to have been forgotten.
Bug: 12277
Change-Id: Iab2d2d0eab52ad0586581abe4df9f97d451ad454
Reviewed-on: https://code.wireshark.org/review/14588
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'ui/gtk/rtp_player.c')
| -rw-r--r-- | ui/gtk/rtp_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 40cae45c3a..bcbd2c9f41 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -1347,7 +1347,7 @@ channel_draw(rtp_channel_info_t *rci) pango_layout_set_font_description(small_layout, pango_font_description_from_string("Helvetica,Sans,Bold 7")); /* calculated the pixel offset to display integer seconds */ - offset = ((double)rci->start_time/1000 - floor((double)rci->start_time/1000))*sample_rate/MULT; + offset = (nstime_to_sec(&rci->start_time_abs) - floor(nstime_to_sec(&rci->start_time_abs)))*sample_rate/MULT; cr = gdk_cairo_create (rci->pixmap); cairo_set_line_width (cr, 1.0); @@ -1454,7 +1454,7 @@ channel_draw(rtp_channel_info_t *rci) timestamp = localtime(&seconds); g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec); } else { - g_snprintf(label_string, MAX_TIME_LABEL, "%.0f s", floor(rci->start_time/1000) + i*MULT/sample_rate); + g_snprintf(label_string, MAX_TIME_LABEL, "%.0f s", floor(nstime_to_sec(&rci->start_time_abs)) + i*MULT/sample_rate); } pango_layout_set_text(small_layout, label_string, -1); |